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

* Added more debug information to track the double remove_map's

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12457 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
FlavioJS 2008-04-02 01:03:31 +00:00
parent e8c4c3e67c
commit ca35192cd0
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/map/unit.c
View File

@ -1577,7 +1577,7 @@ int unit_changeviewsize(struct block_list *bl,short size)
* Otherwise it is assumed bl is being warped. * Otherwise it is assumed bl is being warped.
* On-Kill specific stuff is not performed here, look at status_damage for that. * On-Kill specific stuff is not performed here, look at status_damage for that.
*------------------------------------------*/ *------------------------------------------*/
int unit_remove_map(struct block_list *bl, int clrtype) int unit_remove_map_(struct block_list *bl, int clrtype, const char* file, int line, const char* func)
{ {
struct unit_data *ud = unit_bl2ud(bl); struct unit_data *ud = unit_bl2ud(bl);
struct status_change *sc = status_get_sc(bl); struct status_change *sc = status_get_sc(bl);
@ -1691,17 +1691,29 @@ int unit_remove_map(struct block_list *bl, int clrtype)
if( map[bl->m].users <= 0 || sd->state.debug_remove_map ) if( map[bl->m].users <= 0 || sd->state.debug_remove_map )
{// this is only place where map users is decreased, if the mobs were removed too soon then this function was executed too many times [FlavioJS] {// this is only place where map users is decreased, if the mobs were removed too soon then this function was executed too many times [FlavioJS]
if( sd->debug_file == NULL || !(sd->state.debug_remove_map) )
{
sd->debug_file = "";
sd->debug_line = 0;
sd->debug_func = "";
}
ShowDebug("unit_remove_map: unexpected state when removing player AID/CID:%d/%d" ShowDebug("unit_remove_map: unexpected state when removing player AID/CID:%d/%d"
" (active=%d connect_new=%d rewarp=%d changemap=%d debug_remove_map=%d)" " (active=%d connect_new=%d rewarp=%d changemap=%d debug_remove_map=%d)"
" from map=%s (users=%d). Please report this!!!\n", " from map=%s (users=%d)."
" Previous call from %s:%d(%s), current call from %s:%d(%s)."
" Please report this!!!\n",
sd->status.account_id, sd->status.char_id, sd->status.account_id, sd->status.char_id,
sd->state.active, sd->state.connect_new, sd->state.rewarp, sd->state.changemap, sd->state.debug_remove_map, sd->state.active, sd->state.connect_new, sd->state.rewarp, sd->state.changemap, sd->state.debug_remove_map,
map[bl->m].name, map[bl->m].users); map[bl->m].name, map[bl->m].users,
sd->debug_file, sd->debug_line, sd->debug_func, file, line, func);
} }
else else
if (--map[bl->m].users == 0 && battle_config.dynamic_mobs) //[Skotlex] if (--map[bl->m].users == 0 && battle_config.dynamic_mobs) //[Skotlex]
map_removemobs(bl->m); map_removemobs(bl->m);
sd->state.debug_remove_map = 1; // temporary state to track double remove_map's [FlavioJS] sd->state.debug_remove_map = 1; // temporary state to track double remove_map's [FlavioJS]
sd->debug_file = file;
sd->debug_line = line;
sd->debug_func = func;
break; break;
} }

3
src/map/unit.h
View File

@ -114,7 +114,8 @@ int unit_fixdamage(struct block_list *src,struct block_list *target,unsigned int
struct unit_data* unit_bl2ud(struct block_list *bl); struct unit_data* unit_bl2ud(struct block_list *bl);
void unit_remove_map_pc(struct map_session_data *sd, int clrtype); void unit_remove_map_pc(struct map_session_data *sd, int clrtype);
void unit_free_pc(struct map_session_data *sd); void unit_free_pc(struct map_session_data *sd);
int unit_remove_map(struct block_list *bl, int clrtype); #define unit_remove_map(bl,clrtype) unit_remove_map_(bl,clrtype,__FILE__,__LINE__,__func__)
int unit_remove_map_(struct block_list *bl, int clrtype, const char* file, int line, const char* func);
int unit_free(struct block_list *bl, int clrtype); int unit_free(struct block_list *bl, int clrtype);
int unit_changeviewsize(struct block_list *bl,short size); int unit_changeviewsize(struct block_list *bl,short size);