empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Get rid of struct newscache"

Browse source 
This reverts commit 832574b6de.

To prepare for removal of struct nwsstr member nws_uid.

Conflicts:

	src/lib/subs/nreport.c
This commit is contained in:
Markus Armbruster 2009-12-31 07:36:47 +01:00
parent 4e895465df
commit 39114987a9
1 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/lib/subs/nreport.c
View file

@ -44,24 +44,30 @@
#define SLOTS 5 #define SLOTS 5
static struct nwsstr cache[MAXNOC][SLOTS]; struct newscache {
struct nwsstr news;
int id;
};
static struct newscache cache[MAXNOC][SLOTS];
static int news_tail; static int news_tail;
static struct nwsstr *ncache(int actor, int event, int victim, int times); static struct newscache *
ncache(int actor, int event, int victim, int times);
void void
nreport(natid actor, int event, natid victim, int times) nreport(natid actor, int event, natid victim, int times)
{ {
int nice; int nice;
struct natstr *natp; struct natstr *natp;
struct nwsstr *np; struct newscache *ncp;
if (CANT_HAPPEN((unsigned)event > N_MAX_VERB if (CANT_HAPPEN((unsigned)event > N_MAX_VERB
|| rpt[event].r_newstory[0] == rpt[0].r_newstory[0])) || rpt[event].r_newstory[0] == rpt[0].r_newstory[0]))
return; return;
np = ncache(actor, event, victim, times); ncp = ncache(actor, event, victim, times);
putnews(np->nws_uid, np); putnews(ncp->id, &ncp->news);
/* /*
* this is probably pretty expensive, but hopefully we * this is probably pretty expensive, but hopefully we
@ -149,10 +155,10 @@ init_nreport(void)
* in the last 5 minutes, if so just increment the times * in the last 5 minutes, if so just increment the times
* field instead of creating a new message. * field instead of creating a new message.
*/ */
static struct nwsstr * static struct newscache *
ncache(int actor, int event, int victim, int times) ncache(int actor, int event, int victim, int times)
{ {
struct nwsstr *np; struct newscache *np;
int i; int i;
int oldslot; int oldslot;
time_t oldtime; time_t oldtime;
@ -162,17 +168,17 @@ ncache(int actor, int event, int victim, int times)
oldtime = 0x7fffffff; oldtime = 0x7fffffff;
for (i = 0; i < SLOTS; i++) { for (i = 0; i < SLOTS; i++) {
np = &cache[actor][i]; np = &cache[actor][i];
if (np->nws_when < oldtime) { if (np->news.nws_when < oldtime) {
oldslot = i; oldslot = i;
oldtime = np->nws_when; oldtime = np->news.nws_when;
} }
if (np->nws_vrb == 0) if (np->news.nws_vrb == 0)
continue; continue;
if (now - np->nws_when > minutes(5)) if ((now - np->news.nws_when) > minutes(5))
continue; continue;
if (np->nws_vrb == event && np->nws_vno == victim if (np->news.nws_vrb == event && np->news.nws_vno == victim &&
&& np->nws_ntm + times <= 127) { np->news.nws_ntm + times <= 127) {
np->nws_ntm += times; np->news.nws_ntm += times;
return np; return np;
} }
} }
@ -181,12 +187,12 @@ ncache(int actor, int event, int victim, int times)
if (CANT_HAPPEN(!strstr(rpt[event].r_newstory[0], "%s") && victim != 0)) if (CANT_HAPPEN(!strstr(rpt[event].r_newstory[0], "%s") && victim != 0))
victim = 0; victim = 0;
np = &cache[actor][oldslot]; np = &cache[actor][oldslot];
ef_blank(EF_NEWS, news_tail, np); ef_blank(EF_NEWS, news_tail, &np->news);
np->nws_ano = actor; np->news.nws_ano = actor;
np->nws_vno = victim; np->news.nws_vno = victim;
np->nws_when = now; np->news.nws_when = now;
np->nws_vrb = event; np->news.nws_vrb = event;
np->nws_ntm = times; np->news.nws_ntm = times;
news_tail++; np->id = news_tail++;
return np; return np;
} }