Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Efficiency improvement for clif_send (use pc_db iterator instead of sockets array).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13463 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2009-01-20 21:55:07 +00:00
parent d60b27d27d
commit dfe2b1edaa
1 changed files with 63 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
src/map/clif.c
View File

@ -228,10 +228,11 @@ int clif_send_sub(struct block_list *bl, va_list ap)
int clif_send(const uint8* buf, int len, struct block_list* bl, enum send_target type) int clif_send(const uint8* buf, int len, struct block_list* bl, enum send_target type)
{ {
int i; int i;
struct map_session_data *sd; struct map_session_data *sd, *tsd;
struct party_data *p = NULL; struct party_data *p = NULL;
struct guild *g = NULL; struct guild *g = NULL;
int x0 = 0, x1 = 0, y0 = 0, y1 = 0, fd; int x0 = 0, x1 = 0, y0 = 0, y1 = 0, fd;
struct s_mapiterator* iter;
if( type != ALL_CLIENT && type != CHAT_MAINCHAT ) if( type != ALL_CLIENT && type != CHAT_MAINCHAT )
nullpo_retr(0, bl); nullpo_retr(0, bl);
@ -239,32 +240,35 @@ int clif_send(const uint8* buf, int len, struct block_list* bl, enum send_target
sd = BL_CAST(BL_PC, bl); sd = BL_CAST(BL_PC, bl);
switch(type) { switch(type) {
case ALL_CLIENT: //All player clients. case ALL_CLIENT: //All player clients.
for (i = 0; i < fd_max; i++) { iter = mapit_getallusers();
if (session[i] && session[i]->func_parse == clif_parse && while( (tsd = (TBL_PC*)mapit_next(iter)) != NULL )
(sd = (struct map_session_data *)session[i]->session_data) != NULL && {
sd->state.active && if( packet_db[tsd->packet_ver][RBUFW(buf,0)].len )
packet_db[sd->packet_ver][RBUFW(buf,0)].len)
{ // packet must exist for the client version { // packet must exist for the client version
WFIFOHEAD(i, len); WFIFOHEAD(tsd->fd, len);
memcpy(WFIFOP(i,0), buf, len); memcpy(WFIFOP(tsd->fd,0), buf, len);
WFIFOSET(i,len); WFIFOSET(tsd->fd,len);
} }
} }
mapit_free(iter);
break; break;
case ALL_SAMEMAP: //All players on the same map case ALL_SAMEMAP: //All players on the same map
for(i = 0; i < fd_max; i++) { iter = mapit_getallusers();
if (session[i] && session[i]->func_parse == clif_parse && while( (tsd = (TBL_PC*)mapit_next(iter)) != NULL )
(sd = (struct map_session_data*)session[i]->session_data) != NULL && {
sd->state.active && sd->bl.m == bl->m && if( sd->bl.m == tsd->bl.m && packet_db[tsd->packet_ver][RBUFW(buf,0)].len )
packet_db[sd->packet_ver][RBUFW(buf,0)].len)
{ // packet must exist for the client version { // packet must exist for the client version
WFIFOHEAD(i,len); WFIFOHEAD(tsd->fd, len);
memcpy(WFIFOP(i,0), buf, len); memcpy(WFIFOP(tsd->fd,0), buf, len);
WFIFOSET(i,len); WFIFOSET(tsd->fd,len);
} }
} }
mapit_free(iter);
break; break;
case AREA: case AREA:
case AREA_WOSC: case AREA_WOSC:
if (sd && bl->prev == NULL) //Otherwise source misses the packet.[Skotlex] if (sd && bl->prev == NULL) //Otherwise source misses the packet.[Skotlex]
@ -278,6 +282,7 @@ int clif_send(const uint8* buf, int len, struct block_list* bl, enum send_target
map_foreachinarea(clif_send_sub, bl->m, bl->x-(AREA_SIZE-5), bl->y-(AREA_SIZE-5), map_foreachinarea(clif_send_sub, bl->m, bl->x-(AREA_SIZE-5), bl->y-(AREA_SIZE-5),
bl->x+(AREA_SIZE-5), bl->y+(AREA_SIZE-5), BL_PC, buf, len, bl, AREA_WOC); bl->x+(AREA_SIZE-5), bl->y+(AREA_SIZE-5), BL_PC, buf, len, bl, AREA_WOC);
break; break;
case CHAT: case CHAT:
case CHAT_WOS: case CHAT_WOS:
{ {
@ -303,18 +308,21 @@ int clif_send(const uint8* buf, int len, struct block_list* bl, enum send_target
} }
} }
break; break;
case CHAT_MAINCHAT: //[LuzZza] case CHAT_MAINCHAT: //[LuzZza]
for(i=1; i<fd_max; i++) { iter = mapit_getallusers();
if (session[i] && session[i]->func_parse == clif_parse && while( (tsd = (TBL_PC*)mapit_next(iter)) != NULL )
(sd = (struct map_session_data*)session[i]->session_data) != NULL && {
sd->state.active && sd->state.mainchat && !sd->chatID) if( tsd->state.mainchat && tsd->chatID == 0 && packet_db[tsd->packet_ver][RBUFW(buf,0)].len )
{ { // packet must exist for the client version
WFIFOHEAD(i,len); WFIFOHEAD(tsd->fd, len);
memcpy(WFIFOP(i,0), buf, len); memcpy(WFIFOP(tsd->fd,0), buf, len);
WFIFOSET(i, len); WFIFOSET(tsd->fd,len);
} }
} }
mapit_free(iter);
break; break;
case PARTY_AREA: case PARTY_AREA:
case PARTY_AREA_WOS: case PARTY_AREA_WOS:
x0 = bl->x - AREA_SIZE; x0 = bl->x - AREA_SIZE;
@ -354,39 +362,40 @@ int clif_send(const uint8* buf, int len, struct block_list* bl, enum send_target
} }
if (!enable_spy) //Skip unnecessary parsing. [Skotlex] if (!enable_spy) //Skip unnecessary parsing. [Skotlex]
break; break;
for (i = 1; i < fd_max; i++){ // partyspy [Syrus22]
if (session[i] && session[i]->func_parse == clif_parse && iter = mapit_getallusers();
(sd = (struct map_session_data*)session[i]->session_data) != NULL && while( (tsd = (TBL_PC*)mapit_next(iter)) != NULL )
sd->state.active && sd->partyspy == p->party.party_id && {
packet_db[sd->packet_ver][RBUFW(buf,0)].len) if( tsd->partyspy == p->party.party_id && packet_db[tsd->packet_ver][RBUFW(buf,0)].len )
{ // packet must exist for the client version { // packet must exist for the client version
WFIFOHEAD(i,len); WFIFOHEAD(tsd->fd, len);
memcpy(WFIFOP(i,0), buf, len); memcpy(WFIFOP(tsd->fd,0), buf, len);
WFIFOSET(i,len); WFIFOSET(tsd->fd,len);
} }
} }
mapit_free(iter);
} }
break; break;
case DUEL: case DUEL:
case DUEL_WOS: case DUEL_WOS:
if (!sd || !sd->duel_group) break; //Invalid usage. if (!sd || !sd->duel_group) break; //Invalid usage.
x0 = sd->duel_group; //Here we use x0 to store the duel group. [Skotlex] iter = mapit_getallusers();
for (i = 0; i < fd_max; i++) { while( (tsd = (TBL_PC*)mapit_next(iter)) != NULL )
if (session[i] && session[i]->func_parse == clif_parse && {
(sd = (struct map_session_data *)session[i]->session_data) != NULL && if( type == DUEL_WOS && sd->bl.id == tsd->bl.id )
sd->state.active && sd->duel_group == x0) { continue;
if (type == DUEL_WOS && bl->id == sd->bl.id) if( sd->duel_group == tsd->duel_group && packet_db[tsd->packet_ver][RBUFW(buf,0)].len )
continue; { // packet must exist for the client version
if (packet_db[sd->packet_ver][RBUFW(buf,0)].len) { WFIFOHEAD(tsd->fd, len);
WFIFOHEAD(i, len); memcpy(WFIFOP(tsd->fd,0), buf, len);
memcpy(WFIFOP(i,0), buf, len); WFIFOSET(tsd->fd,len);
WFIFOSET(i,len);
}
} }
} }
mapit_free(iter);
break; break;
case SELF: case SELF:
if (sd && (fd=sd->fd) && packet_db[sd->packet_ver][RBUFW(buf,0)].len) { // packet must exist for the client version if (sd && (fd=sd->fd) && packet_db[sd->packet_ver][RBUFW(buf,0)].len) { // packet must exist for the client version
WFIFOHEAD(fd,len); WFIFOHEAD(fd,len);
@ -435,17 +444,18 @@ int clif_send(const uint8* buf, int len, struct block_list* bl, enum send_target
} }
if (!enable_spy) //Skip unnecessary parsing. [Skotlex] if (!enable_spy) //Skip unnecessary parsing. [Skotlex]
break; break;
for (i = 1; i < fd_max; i++){ // guildspy [Syrus22]
if (session[i] && session[i]->func_parse == clif_parse && iter = mapit_getallusers();
(sd = (struct map_session_data*)session[i]->session_data) != NULL && while( (tsd = (TBL_PC*)mapit_next(iter)) != NULL )
sd->state.active && sd->guildspy == g->guild_id && {
packet_db[sd->packet_ver][RBUFW(buf,0)].len) if( tsd->guildspy == g->guild_id && packet_db[tsd->packet_ver][RBUFW(buf,0)].len )
{ // packet must exist for the client version { // packet must exist for the client version
WFIFOHEAD(i,len); WFIFOHEAD(tsd->fd, len);
memcpy(WFIFOP(i,0), buf, len); memcpy(WFIFOP(tsd->fd,0), buf, len);
WFIFOSET(i,len); WFIFOSET(tsd->fd,len);
} }
} }
mapit_free(iter);
} }
break; break;