* Dave Pare, 1994
* Steve McClure, 1997
* Ron Koenderink, 2005
- * Markus Armbruster, 2004-2008
+ * Markus Armbruster, 2004-2009
*/
#include <config.h>
#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 struct nwsstr *ncache(int actor, int event, int victim, int times);
+static struct newscache *
+ncache(int actor, int event, int victim, int times);
void
nreport(natid actor, int event, natid victim, int times)
{
int nice;
struct natstr *natp;
- struct nwsstr *np;
+ struct newscache *ncp;
if (CANT_HAPPEN((unsigned)event > N_MAX_VERB
|| rpt[event].r_newstory[0] == rpt[0].r_newstory[0]))
return;
- np = ncache(actor, event, victim, times);
- putnews(np->nws_uid, np);
+ ncp = ncache(actor, event, victim, times);
+ putnews(ncp->id, &ncp->news);
/*
* this is probably pretty expensive, but hopefully we
for (j = 0; getnews(i + j, &news); j++) {
if (news.nws_vrb == 0)
break;
- ef_set_uid(EF_NEWS, &news, j);
putnews(j, &news);
}
CANT_HAPPEN(i + j != news_tail);
* in the last 5 minutes, if so just increment the times
* field instead of creating a new message.
*/
-static struct nwsstr *
+static struct newscache *
ncache(int actor, int event, int victim, int times)
{
- struct nwsstr *np;
+ struct newscache *np;
int i;
int oldslot;
- time_t oldtime;
+ time_t oldtime, dur;
time_t now = time(NULL);
oldslot = -1;
oldtime = 0x7fffffff;
for (i = 0; i < SLOTS; i++) {
np = &cache[actor][i];
- if (np->nws_when < oldtime) {
+ if (np->news.nws_when < oldtime) {
oldslot = i;
- oldtime = np->nws_when;
+ oldtime = np->news.nws_when;
}
- if (np->nws_vrb == 0)
+ if (np->news.nws_vrb == 0)
continue;
- if (now - np->nws_when > minutes(5))
+ dur = now - np->news.nws_when;
+ if (dur > minutes(5))
continue;
- if (np->nws_vrb == event && np->nws_vno == victim
- && np->nws_ntm + times <= 127) {
- np->nws_ntm += times;
+ if (np->news.nws_vrb == event && np->news.nws_vno == victim &&
+ np->news.nws_ntm + times <= 127) {
+ np->news.nws_ntm += times;
+ np->news.nws_duration = dur;
return np;
}
}
if (CANT_HAPPEN(!strstr(rpt[event].r_newstory[0], "%s") && victim != 0))
victim = 0;
np = &cache[actor][oldslot];
- ef_blank(EF_NEWS, news_tail, np);
- np->nws_ano = actor;
- np->nws_vno = victim;
- np->nws_when = now;
- np->nws_vrb = event;
- np->nws_ntm = times;
- news_tail++;
+ ef_blank(EF_NEWS, news_tail, &np->news);
+ np->news.nws_ano = actor;
+ np->news.nws_vrb = event;
+ np->news.nws_vno = victim;
+ np->news.nws_ntm = times;
+ np->news.nws_duration = 0;
+ np->news.nws_when = now;
+ np->id = news_tail++;
return np;
}