Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions api/proto/v1/guid/guid.proto
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ enum GuidType {
Character = 0;
Item = 1;
Instance = 2;
PetNumber = 3;
}

message GetGUIDPoolRequest {
Expand Down
20 changes: 20 additions & 0 deletions apps/guidserver/repo/mysql-max-guid-provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ type MaxGuidProvider interface {

// MaxGuidForInstances returns max guid for dungeon/raid instance.
MaxGuidForInstances(ctx context.Context, realmID uint32) (uint64, error)
MaxGuidForPetNumbers(ctx context.Context, realmID uint32) (uint64, error)
}

type mysqlMaxGuidRepo struct {
Expand All @@ -26,6 +27,7 @@ func NewMysqlMaxGuidRepo(db shrepo.CharactersDB) (MaxGuidProvider, error) {
db.SetPreparedStatement(StmtGetMaxCharacterGUID)
db.SetPreparedStatement(StmtGetMaxItemGUID)
db.SetPreparedStatement(StmtGetMaxInstanceGUID)
db.SetPreparedStatement(StmtGetMaxPetNumber)

return &mysqlMaxGuidRepo{
charDB: db,
Expand Down Expand Up @@ -76,6 +78,21 @@ func (m *mysqlMaxGuidRepo) MaxGuidForInstances(ctx context.Context, realmID uint

// CharsPreparedStatements represents prepared statements for the characters database.
// Implements sharedrepo.PreparedStatement interface.
func (m *mysqlMaxGuidRepo) MaxGuidForPetNumbers(ctx context.Context, realmID uint32) (uint64, error) {
row := m.charDB.PreparedStatement(realmID, StmtGetMaxPetNumber).QueryRowContext(ctx)
if row.Err() != nil {
return 0, row.Err()
}

var guid uint64
err := row.Scan(&guid)
if err != nil {
return 0, err
}

return guid, nil
}

type CharsPreparedStatements uint32

const (
Expand All @@ -87,6 +104,7 @@ const (

// StmtGetMaxInstanceGUID returns max GUID for instance table.
StmtGetMaxInstanceGUID
StmtGetMaxPetNumber
)

// ID returns identifier of prepared statement.
Expand All @@ -103,6 +121,8 @@ func (s CharsPreparedStatements) Stmt() string {
return "SELECT COALESCE(MAX(guid), 0) FROM item_instance"
case StmtGetMaxInstanceGUID:
return "SELECT COALESCE(MAX(id), 0) FROM instance"
case StmtGetMaxPetNumber:
return "SELECT COALESCE(MAX(id), 0) FROM character_pet"
}
panic(fmt.Errorf("unk stmt %d", s))
}
23 changes: 23 additions & 0 deletions apps/guidserver/repo/redis-max-guid-storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ type MaxGuidStorage interface {

// SetMaxGuidForInstances sets max guid for dungeon/raid instance. Unsafe for concurrent usage. Use IncreaseMaxGuidForItems instead.
SetMaxGuidForInstances(ctx context.Context, realmID uint32, value uint64) error
SetMaxGuidForPetNumbers(ctx context.Context, realmID uint32, value uint64) error

// IncreaseMaxGuidForCharacters increases max character guid to increaseAmount value and returns new max guid.
IncreaseMaxGuidForCharacters(ctx context.Context, realmID uint32, increaseAmount uint64) (uint64, error)
Expand All @@ -28,6 +29,7 @@ type MaxGuidStorage interface {

// IncreaseMaxGuidForInstances increases max dungeon/raid instance guid to increaseAmount value and returns new max guid.
IncreaseMaxGuidForInstances(ctx context.Context, realmID uint32, increaseAmount uint64) (uint64, error)
IncreaseMaxGuidForPetNumbers(ctx context.Context, realmID uint32, increaseAmount uint64) (uint64, error)
}

// NewRedisMaxGuidStorage returns new redis max guids storage.
Expand Down Expand Up @@ -55,6 +57,23 @@ func (r *redisMaxGuidStorage) SetMaxGuidForInstances(ctx context.Context, realmI
return r.rdb.Set(ctx, r.instanceKey(realmID), value, 0).Err()
}

func (r *redisMaxGuidStorage) SetMaxGuidForPetNumbers(ctx context.Context, realmID uint32, value uint64) error {
return r.rdb.Set(ctx, r.petNumberKey(realmID), value, 0).Err()
}

func (r *redisMaxGuidStorage) MaxGuidForPetNumbers(ctx context.Context, realmID uint32) (uint64, error) {
v, err := r.rdb.Get(ctx, r.petNumberKey(realmID)).Uint64()
if err != nil && err != redis.Nil {
return 0, err
}

return v, nil
}

func (r *redisMaxGuidStorage) IncreaseMaxGuidForPetNumbers(ctx context.Context, realmID uint32, increaseAmount uint64) (uint64, error) {
return r.increaseKey(ctx, r.petNumberKey(realmID), increaseAmount)
}

func (r *redisMaxGuidStorage) MaxGuidForCharacters(ctx context.Context, realmID uint32) (uint64, error) {
v, err := r.rdb.Get(ctx, r.characterKey(realmID)).Uint64()
if err != nil && err != redis.Nil {
Expand Down Expand Up @@ -140,3 +159,7 @@ func (r *redisMaxGuidStorage) characterKey(realmID uint32) string {
func (r *redisMaxGuidStorage) instanceKey(realmID uint32) string {
return fmt.Sprintf("realm:%d:maxInstance", realmID)
}

func (r *redisMaxGuidStorage) petNumberKey(realmID uint32) string {
return fmt.Sprintf("realm:%d:maxPetNumber", realmID)
}
34 changes: 34 additions & 0 deletions apps/guidserver/service/guid.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const (
GuidTypeCharacter GuidType = iota
GuidTypeItem
GuidTypeInstance
GuidTypePetNumber
GuidTypeMax
)

Expand Down Expand Up @@ -93,6 +94,24 @@ func NewGuidService(ctx context.Context, mysql repo.MaxGuidProvider, redisStorag
}
}

// Inits pet numbers max in redis if needed.
max, err = redisStorage.MaxGuidForPetNumbers(ctx, realmID)
if err != nil {
return nil, err
}

if max == 0 {
max, err = mysql.MaxGuidForPetNumbers(ctx, realmID)
if err != nil {
return nil, err
}

err = redisStorage.SetMaxGuidForPetNumbers(ctx, realmID, max)
if err != nil {
return nil, err
}
}

caches := [GuidTypeMax]*AvailableDiapasons{}
for i := range service.localCache[realmID] {
caches[i] = &AvailableDiapasons{}
Expand All @@ -111,6 +130,10 @@ func (g *guidServiceImpl) GetGuids(ctx context.Context, realmID uint32, guidType
return nil, fmt.Errorf("realmID %d not found", realmID)
}

if guidType >= uint8(GuidTypeMax) {
return nil, fmt.Errorf("unknown guid type %d", guidType)
}

availableGuids := availableGuidsWithTypes[guidType]

pctUsed := availableGuids.PctUsage()
Expand Down Expand Up @@ -256,6 +279,17 @@ func (g *guidServiceImpl) requestProcessor(requests <-chan guidsRequest, respons
continue
}

case GuidTypePetNumber:
newMax, err = g.maxGuidsStorage.IncreaseMaxGuidForPetNumbers(ctx, r.realmID, r.desiredAmount)
cancel()
if err != nil {
log.Err(err).Msg("can't increase pet numbers guid")
response <- guidsResponse{
request: r,
newGuids: GuidDiapason{},
}
continue
}
default:
log.Err(fmt.Errorf("unk guid type: %d", r.guidType))
cancel()
Expand Down
35 changes: 35 additions & 0 deletions apps/guidserver/service/guid_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ type MaxGuidStorageMock struct {
charCounter []uint64
itemCounter []uint64
instancesCounter []uint64
petNumberCounter []uint64

charLock sync.RWMutex
itemLock sync.RWMutex
instancesLock sync.RWMutex
petNumberLock sync.RWMutex

increaseDelay time.Duration

Expand Down Expand Up @@ -116,6 +118,37 @@ func (m *MaxGuidStorageMock) IncreaseMaxGuidForInstances(ctx context.Context, re
return m.instancesCounter[realmID], nil
}

func (m *MaxGuidStorageMock) MaxGuidForPetNumbers(ctx context.Context, realmID uint32) (uint64, error) {
m.petNumberLock.RLock()
defer m.petNumberLock.RUnlock()

return m.petNumberCounter[realmID], nil
}

func (m *MaxGuidStorageMock) SetMaxGuidForPetNumbers(ctx context.Context, realmID uint32, value uint64) error {
m.petNumberLock.Lock()
defer m.petNumberLock.Unlock()

m.petNumberCounter[realmID] = value
return nil
}

func (m *MaxGuidStorageMock) IncreaseMaxGuidForPetNumbers(ctx context.Context, realmID uint32, increaseAmount uint64) (uint64, error) {
m.petNumberLock.Lock()
defer m.petNumberLock.Unlock()

if m.increaseDelay > 0 {
Comment on lines +136 to +140
time.Sleep(m.increaseDelay)
}

m.counterLock.Lock()
m.requestsCounter++
m.counterLock.Unlock()

m.petNumberCounter[realmID] += increaseAmount
return m.petNumberCounter[realmID], nil
}

func (m *MaxGuidStorageMock) GetRequestsCounter() int {
m.counterLock.Lock()
defer m.counterLock.Unlock()
Expand All @@ -130,6 +163,7 @@ func Test_guidServiceImpl_GetGuids(t *testing.T) {
charCounter: []uint64{1000, 1000, 1000},
itemCounter: []uint64{1, 1, 1},
instancesCounter: []uint64{1, 1, 1},
petNumberCounter: []uint64{1, 1, 1},
//increaseDelay: time.Microsecond * 1,
}

Expand Down Expand Up @@ -158,6 +192,7 @@ func Test_guidServiceImpl_GetGuids_ThreeTypes(t *testing.T) {
charCounter: []uint64{1000, 1000, 1000},
itemCounter: []uint64{1, 1, 1},
instancesCounter: []uint64{50, 50, 50},
petNumberCounter: []uint64{50, 50, 50},
increaseDelay: time.Millisecond * 1,
}

Expand Down
3 changes: 3 additions & 0 deletions game-server/libsidecar-cpp/include/libsidecar.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ TC9_API void TC9ProcessEventsHooks();
TC9_API uint64_t TC9GetNextAvailableCharacterGuid(int realmID);
TC9_API uint64_t TC9GetNextAvailableItemGuid(int realmID);
TC9_API uint64_t TC9GetNextAvailableInstanceGuid(int realmID);
/* Pet numbers (character_pet.id) are shared by every worldserver of a realm
* like character and item guids: taken from the guid service too. Thread safe. */
TC9_API uint64_t TC9GetNextAvailablePetNumber(int realmID);

/* Map loading notification */
TC9_API void TC9ReadyToAcceptPlayersFromMaps(uint32_t* maps, int mapsLen);
Expand Down
14 changes: 14 additions & 0 deletions game-server/libsidecar-cpp/src/api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -709,6 +709,20 @@ TC9_API uint64_t TC9GetNextAvailableInstanceGuid(int realmID) {
}
}

TC9_API uint64_t TC9GetNextAvailablePetNumber(int realmID) {
if (!g_state.initialized) {
return 0;
}

try {
auto& guid_mgr = tc9::GuidManager::Instance();
return guid_mgr.GetNextPetNumber(static_cast<uint32_t>(realmID));
} catch (const std::exception& e) {
spdlog::error("GetNextAvailablePetNumber failed: {}", e.what());
return 0;
}
}

// Event hook registration functions
// These accept old Go-style callbacks and register internal TC9 callbacks that bridge to them

Expand Down
24 changes: 24 additions & 0 deletions game-server/libsidecar-cpp/src/guids/guid_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ GuidManager::GuidManager() {
character_guids_ = std::make_unique<GuidIterator>(0, false); // Character
item_guids_ = std::make_unique<GuidIterator>(1, true); // Item (THREAD-SAFE)
instance_guids_ = std::make_unique<GuidIterator>(2, false); // Instance
pet_number_guids_ = std::make_unique<GuidIterator>(3, true); // PetNumber (THREAD-SAFE)

spdlog::debug("GuidManager created");
}
Expand All @@ -171,6 +172,7 @@ void GuidManager::Initialize(GrpcClients* clients, uint32_t realm_id) {
RefillGuidPool(0, realm_id); // Characters
RefillGuidPool(1, realm_id); // Items
RefillGuidPool(2, realm_id); // Instances
RefillGuidPool(3, realm_id); // Pet numbers

initialized_ = true;
}
Expand Down Expand Up @@ -232,6 +234,25 @@ uint64_t GuidManager::GetNextInstanceGuid(uint32_t realm_id) {
return guid;
}

uint64_t GuidManager::GetNextPetNumber(uint32_t realm_id) {
if (!initialized_) {
spdlog::error("GuidManager not initialized");
return 0;
}

uint32_t realm = realm_id ? realm_id : default_realm_id_;
uint64_t guid = pet_number_guids_->Next(realm);

// Check if we need to refill (async)
if (pet_number_guids_->NeedsRefill()) {
std::thread([this, realm]() {
RefillGuidPool(3, realm);
}).detach();
}

return guid;
}

void GuidManager::RefillGuidPool(int guid_type, uint32_t realm_id) {
if (!grpc_clients_) {
spdlog::error("Cannot refill GUID pool: no gRPC client");
Expand Down Expand Up @@ -260,6 +281,9 @@ void GuidManager::RefillGuidPool(int guid_type, uint32_t realm_id) {
case 2: // Instance
instance_guids_->AddRanges(ranges);
break;
case 3: // PetNumber
pet_number_guids_->AddRanges(ranges);
break;
Comment on lines +284 to +286
default:
spdlog::error("Invalid GUID type: {}", guid_type);
}
Expand Down
4 changes: 3 additions & 1 deletion game-server/libsidecar-cpp/src/guids/guid_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class GuidIterator {
private:
void MoveToNextRange();

int guid_type_; // 0=Character, 1=Item, 2=Instance
int guid_type_; // 0=Character, 1=Item, 2=Instance, 3=PetNumber
bool thread_safe_; // Use atomics if true

// GUID ranges and current position
Expand Down Expand Up @@ -77,6 +77,7 @@ class GuidManager {
uint64_t GetNextCharacterGuid(uint32_t realm_id);
uint64_t GetNextItemGuid(uint32_t realm_id); // THREAD-SAFE
uint64_t GetNextInstanceGuid(uint32_t realm_id);
uint64_t GetNextPetNumber(uint32_t realm_id); // THREAD-SAFE (map threads)

// Check if initialization is needed
bool IsInitialized() const { return initialized_; }
Expand All @@ -102,6 +103,7 @@ class GuidManager {
std::unique_ptr<GuidIterator> character_guids_; // Thread-unsafe (fast)
std::unique_ptr<GuidIterator> item_guids_; // Thread-safe (atomics)
std::unique_ptr<GuidIterator> instance_guids_; // Thread-unsafe (fast)
std::unique_ptr<GuidIterator> pet_number_guids_; // Thread-safe (atomics)

// Pool size to request from service
static constexpr uint64_t POOL_SIZE = 10000;
Expand Down
3 changes: 3 additions & 0 deletions game-server/libsidecar-cpp/tests/c_api_compatibility_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ int main(void) {
uint64_t instance_guid = TC9GetNextAvailableInstanceGuid(0);
printf(" TC9GetNextAvailableInstanceGuid(0) returned: %llu\n", instance_guid);

uint64_t pet_number = TC9GetNextAvailablePetNumber(0);
printf(" TC9GetNextAvailablePetNumber(0) returned: %llu\n", pet_number);

/* Event hooks */
printf("\nTesting event hooks...\n");
TC9SetOnGuildMemberAddedHook(on_guild_member_added);
Expand Down
Loading
Loading