mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 14:57:44 +00:00
Code Activity

Merge pull request #484 from itsMaru/develop

Browse source 
RNGManager PoC
This commit is contained in:
Mordred 2019-01-20 00:39:50 +01:00 • committed by GitHub
commit c181e6de23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 139 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/Network/GamePacketNew.h
View file

@ -258,7 +258,7 @@ namespace Sapphire::Network::Packets
// The IPC type itself.
m_ipcHdr.type = static_cast< ServerZoneIpcType >( m_data._ServerIpcType );
m_ipcHdr.timestamp = static_cast< uint32_t >( Util::getTimeSeconds() );
m_ipcHdr.timestamp = Util::getTimeSeconds();
m_segHdr.size = sizeof( T ) + sizeof( FFXIVARR_IPC_HEADER ) + sizeof( FFXIVARR_PACKET_SEGMENT_HEADER );
};

6
src/common/Util/Util.cpp
View file

@ -119,10 +119,10 @@ uint64_t Sapphire::Util::getTimeMs()
return epoch.count();
}
int64_t Sapphire::Util::getTimeSeconds()
uint32_t Sapphire::Util::getTimeSeconds()
{
std::chrono::seconds epoch = std::chrono::seconds( std::time( nullptr ) );
return epoch.count();
auto currClock = std::chrono::system_clock::now();
return std::chrono::time_point_cast< std::chrono::seconds >( currClock ).time_since_epoch().count();
}
uint64_t Sapphire::Util::getEorzeanTimeStamp()

7
src/common/Util/Util.h
View file

@ -21,7 +21,12 @@ namespace Sapphire::Util
uint64_t getTimeMs();
int64_t getTimeSeconds();
/*!
* @brief Get a POSIX epoch representation of the current time
* @return 32-bit unsigned integer
*/
uint32_t getTimeSeconds();
uint64_t getEorzeanTimeStamp();

2
src/world/Actor/Player.cpp
View file

@ -1586,7 +1586,7 @@ uint32_t Sapphire::Entity::Player::getCFPenaltyMinutes() const
void Sapphire::Entity::Player::setCFPenaltyMinutes( uint32_t minutes )
{
auto currentTimestamp = Sapphire::Util::getTimeSeconds();
setCFPenaltyTimestamp( static_cast< uint32_t >( currentTimestamp + minutes * 60 ) );
setCFPenaltyTimestamp( currentTimestamp + minutes * 60 );
}
uint8_t Sapphire::Entity::Player::getOpeningSequence() const

3
src/world/Manager/MarketMgr.cpp
View file

@ -83,12 +83,11 @@ void Sapphire::World::Manager::MarketMgr::requestItemListingInfo( Sapphire::Enti
listing.itemCatalogId = catalogId;
listing.quantity = i + 1;
listing.purchaseTime = time( nullptr );
listing.purchaseTime = Sapphire::Util::getTimeSeconds();
listing.salePrice = 69420420;
listing.isHq = 1;
listing.onMannequin = 1;
strcpy( listing.buyerName, name.c_str() );
}

10
src/world/Manager/RNGMgr.cpp Normal file
View file

@ -0,0 +1,10 @@
#include "RNGMgr.h"
#include <Logging/Logger.h>
Sapphire::World::Manager::RNGMgr::RNGMgr( FrameworkPtr pFw ) :
BaseManager( pFw ),
m_engine( *engineSeed< std::mt19937::state_size >() )
{
}

94
src/world/Manager/RNGMgr.h Normal file
View file

@ -0,0 +1,94 @@
#ifndef SAPPHIRE_RNGMGR_H
#define SAPPHIRE_RNGMGR_H
#include "Forwards.h"
#include "BaseManager.h"
#include <array>
#include <algorithm>
#include <chrono>
#include <random>
#include <memory>
#include <type_traits>
namespace Sapphire::World::Manager
{
/*!
* @brief Generator object that is used on multiple state situations
*/
template< typename T, typename = typename std::enable_if< std::is_arithmetic< T >::value, T >::type >
class RandGenerator
{
public:
RandGenerator( T minRange = std::numeric_limits< T >::min(), T maxRange = std::numeric_limits< T >::max() )
: m_engine( *engineSeed< std::mt19937::state_size >() ), m_dist( minRange, maxRange )
{
}
T next()
{
return m_dist( m_engine );
}
private:
template< std::size_t STATE_SIZE >
std::unique_ptr< std::seed_seq > engineSeed()
{
std::array< uint32_t, STATE_SIZE > seedArray;
std::random_device rd;
std::generate_n( seedArray.data(), seedArray.size(), std::ref( rd ) );
auto pSeq = std::make_unique< std::seed_seq >( std::begin( seedArray ), std::end( seedArray ) );
return pSeq;
}
std::uniform_real_distribution< T > m_dist;
std::mt19937 m_engine;
};
class RNGMgr : public BaseManager
{
public:
RNGMgr( FrameworkPtr pFw );
virtual ~RNGMgr() = default;
RNGMgr( const RNGMgr& pRNGMgr ) = delete;
RNGMgr& operator=( const RNGMgr& pRNGMgr ) = delete;
/*!
* @brief Creates a RNG with specified parameters for multiple uses
* @tparam Numeric type to be used for the generator
* @param Minimum value possible for the random value
* @param Maximum value possible for the random value
* @return Random number generator object
*/
template< typename T, typename = typename std::enable_if< std::is_arithmetic< T >::value, T >::type >
RandGenerator< T > getRandGenerator( T minRange, T maxRange )
{
return RandGenerator< T >( minRange, maxRange );
}
private:
template< std::size_t STATE_SIZE >
std::unique_ptr< std::seed_seq > engineSeed()
{
std::array< uint32_t, STATE_SIZE > seedArray;
std::random_device rd;
std::generate_n( seedArray.data(), seedArray.size(), std::ref( rd ) );
auto pSeq = std::make_unique< std::seed_seq >( std::begin( seedArray ), std::end( seedArray ) );
return pSeq;
}
std::mt19937 m_engine;
};
}
#endif // SAPPHIRE_RNGMGR_H

3
src/world/Network/GameConnection.cpp
View file

@ -385,6 +385,7 @@ void Sapphire::Network::GameConnection::handlePackets( const Sapphire::Network::
const std::vector< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW >& packetData )
{
auto pServerZone = m_pFw->get< World::ServerMgr >();
// if a session is set, update the last time it recieved a game packet
if( m_pSession )
m_pSession->updateLastDataTime();
@ -427,7 +428,7 @@ void Sapphire::Network::GameConnection::handlePackets( const Sapphire::Network::
auto pe = std::make_shared< FFXIVRawPacket >( 0x07, 0x18, 0, 0 );
*( unsigned int* ) ( &pe->data()[ 0 ] ) = 0xE0037603;
*( unsigned int* ) ( &pe->data()[ 4 ] ) = static_cast< uint32_t >( time( nullptr ) );
*( unsigned int* ) ( &pe->data()[ 4 ] ) = Sapphire::Util::getTimeSeconds();
sendSinglePacket( pe );
// main connection, assinging it to the session

7
src/world/Network/Handlers/PacketHandlers.cpp
View file

@ -14,10 +14,8 @@
#include "Network/GameConnection.h"
#include "Manager/TerritoryMgr.h"
#include "Territory/Zone.h"
#include "Territory/HousingZone.h"
#include "Manager/HousingMgr.h"
#include "Territory/Land.h"
#include "Territory/ZonePosition.h"
#include "Territory/House.h"
@ -37,6 +35,9 @@
#include "Manager/DebugCommandMgr.h"
#include "Manager/EventMgr.h"
#include "Manager/MarketMgr.h"
#include "Manager/TerritoryMgr.h"
#include "Manager/HousingMgr.h"
#include "Manager/RNGMgr.h"
#include "Action/Action.h"
#include "Action/ActionTeleport.h"
@ -440,7 +441,7 @@ void Sapphire::Network::GameConnection::pingHandler( FrameworkPtr pFw,
queueOutPacket( std::make_shared< Server::PingPacket >( player, packet.data().timestamp ) );
player.setLastPing( static_cast< uint32_t >( time( nullptr ) ) );
player.setLastPing( Sapphire::Util::getTimeSeconds() );
}

5
src/world/ServerMgr.cpp
View file

@ -40,6 +40,7 @@
#include "Manager/EventMgr.h"
#include "Manager/ItemMgr.h"
#include "Manager/MarketMgr.h"
#include "Manager/RNGMgr.h"
using namespace Sapphire::World::Manager;
@ -205,6 +206,7 @@ void Sapphire::World::ServerMgr::run( int32_t argc, char* argv[] )
auto pInventoryMgr = std::make_shared< Manager::InventoryMgr >( framework() );
auto pEventMgr = std::make_shared< Manager::EventMgr >( framework() );
auto pItemMgr = std::make_shared< Manager::ItemMgr >( framework() );
auto pRNGMgr = std::make_shared< Manager::RNGMgr >( framework() );
framework()->set< DebugCommandMgr >( pDebugCom );
framework()->set< Manager::PlayerMgr >( pPlayerMgr );
@ -212,6 +214,7 @@ void Sapphire::World::ServerMgr::run( int32_t argc, char* argv[] )
framework()->set< Manager::InventoryMgr >( pInventoryMgr );
framework()->set< Manager::EventMgr >( pEventMgr );
framework()->set< Manager::ItemMgr >( pItemMgr );
framework()->set< Manager::RNGMgr >( pRNGMgr );
Logger::info( "World server running on {0}:{1}", m_ip, m_port );
@ -256,7 +259,7 @@ void Sapphire::World::ServerMgr::mainLoop()
auto currTime = Util::getTimeSeconds();
pTeriMgr->updateTerritoryInstances( static_cast< uint32_t >( currTime ) );
pTeriMgr->updateTerritoryInstances( currTime );
pScriptMgr->update();

2
src/world/Session.cpp
View file

@ -206,7 +206,7 @@ void Sapphire::World::Session::update()
// SESSION LOGIC
m_pPlayer->update( Util::getTimeMs() );
if( ( static_cast< uint32_t >( Util::getTimeSeconds() ) - static_cast< uint32_t >( getLastSqlTime() ) ) > 10 )
if( Util::getTimeSeconds() - static_cast< uint32_t >( getLastSqlTime() ) > 10 )
{
updateLastSqlTime();
m_pPlayer->updateSql();

4
src/world/Session.h
View file

@ -56,9 +56,9 @@ namespace Sapphire::World
Entity::PlayerPtr m_pPlayer;
int64_t m_lastDataTime;
uint32_t m_lastDataTime;
int64_t m_lastSqlTime;
uint32_t m_lastSqlTime;
bool m_isValid;
bool m_isReplaying;

2
src/world/Territory/Housing/HousingInteriorTerritory.cpp
View file

@ -39,7 +39,7 @@ Sapphire::World::Territory::Housing::HousingInteriorTerritory::HousingInteriorTe
Zone( territoryTypeId, guId, internalName, contentName, pFw ),
m_landIdent( ident )
{
m_lastActivityTime = static_cast< uint32_t >( Util::getTimeSeconds() );
m_lastActivityTime = Util::getTimeSeconds();
}
Housing::HousingInteriorTerritory::~HousingInteriorTerritory() = default;

4
src/world/Territory/Land.cpp
View file

@ -30,7 +30,7 @@ Sapphire::Land::Land( uint16_t territoryTypeId, uint8_t wardNum, uint8_t landId,
Sapphire::Data::HousingLandSetPtr info, FrameworkPtr pFw ) :
m_currentPrice( 0 ),
m_minPrice( 0 ),
m_nextDrop( static_cast< uint32_t >( Util::getTimeSeconds() ) + 21600 ),
m_nextDrop( Util::getTimeSeconds() + 21600 ),
m_ownerId( 0 ),
m_landSetId( landSetId ),
m_landInfo( info ),
@ -185,7 +185,7 @@ uint64_t Sapphire::Land::getOwnerId()
uint32_t Sapphire::Land::getDevaluationTime()
{
return m_nextDrop - static_cast< uint32_t >( Util::getTimeSeconds() );
return m_nextDrop - Util::getTimeSeconds();
}
void Sapphire::Land::setCurrentPrice( uint32_t currentPrice )

14
src/world/Territory/Zone.cpp
View file

@ -39,6 +39,8 @@
#include "Zone.h"
#include "Framework.h"
#include <Manager/RNGMgr.h>
using namespace Sapphire::Common;
using namespace Sapphire::Network::Packets;
using namespace Sapphire::Network::Packets::Server;
@ -159,7 +161,7 @@ void Sapphire::Zone::loadCellCache()
Weather Sapphire::Zone::getNextWeather()
{
uint32_t unixTime = static_cast< uint32_t >( Util::getTimeSeconds() );
uint32_t unixTime = Util::getTimeSeconds();
// Get Eorzea hour for weather start
uint32_t bell = unixTime / 175;
// Do the magic 'cause for calculations 16:00 is 0, 00:00 is 8 and 08:00 is 16
@ -381,9 +383,8 @@ void Sapphire::Zone::updateBNpcs( int64_t tickCount )
{
if( ( tickCount - m_lastMobUpdate ) > 250 )
{
m_lastMobUpdate = tickCount;
uint32_t currTime = static_cast< uint32_t >( time( nullptr ) );
uint32_t currTime = Sapphire::Util::getTimeSeconds();
/*for( auto it3 = m_BattleNpcDeadMap.begin(); it3 != m_BattleNpcDeadMap.end(); ++it3 )
{
@ -812,9 +813,8 @@ bool Sapphire::Zone::loadSpawnGroups()
void Sapphire::Zone::updateSpawnPoints()
{
std::random_device rd;
std::mt19937 mt( rd() );
std::uniform_real_distribution< float > dist( 0.0, PI * 2 );
auto pRNGMgr = m_pFw->get< World::Manager::RNGMgr >();
auto rng = pRNGMgr->getRandGenerator< float >( 0.f, PI * 2 );
for( auto& group : m_spawnGroups )
{
@ -837,7 +837,7 @@ void Sapphire::Zone::updateSpawnPoints()
point->getPosX(),
point->getPosY(),
point->getPosZ(),
dist( mt ),
rng.next(),
group.getLevel(),
group.getMaxHp(), shared_from_this(), m_pFw );
point->setLinkedBNpc( pBNpc );