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

(wu,typed_wu): close() a sent telegram before waking up other threads.

Browse source 
Remove s_char and register on the way.
This commit is contained in:
Marc Olzheim 2005-03-26 00:23:25 +00:00
parent 73a94a3591
commit e15b045713
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/prototypes.h
View file

@ -709,8 +709,8 @@ extern int trechk(register natid, register natid, int);
/* in item.h */ /* in item.h */
/* wu.c */ /* wu.c */
extern void clear_telegram_is_new(natid); extern void clear_telegram_is_new(natid);
extern int typed_wu(natid, natid, s_char *, int); extern int typed_wu(natid, natid, char *, int);
extern int wu(natid, natid, s_char *, ...) ATTRIBUTE((format (printf, 3, 4))); extern int wu(natid, natid, char *, ...) ATTRIBUTE((format (printf, 3, 4)));
/* /*
* src/lib/update/ *.c * src/lib/update/ *.c

21
src/lib/subs/wu.c
View file

@ -80,11 +80,11 @@ telegram_is_new(natid to, struct telstr *tel)
/*VARARGS*/ /*VARARGS*/
int int
wu(natid from, natid to, s_char *format, ...) wu(natid from, natid to, char *format, ...)
{ {
struct natstr *np; struct natstr *np;
va_list ap; va_list ap;
s_char buf[4096]; char buf[4096];
va_start(ap, format); va_start(ap, format);
(void)vsprintf(buf, format, ap); (void)vsprintf(buf, format, ap);
@ -99,9 +99,9 @@ wu(natid from, natid to, s_char *format, ...)
} }
int int
typed_wu(natid from, natid to, s_char *message, int type) typed_wu(natid from, natid to, char *message, int type)
{ {
register s_char *bp; char *bp;
int len; int len;
struct telstr tel; struct telstr tel;
struct natstr *np; struct natstr *np;
@ -109,8 +109,9 @@ typed_wu(natid from, natid to, s_char *message, int type)
struct iovec iov[2]; struct iovec iov[2];
#endif #endif
int fd; int fd;
s_char box[1024]; char box[1024];
int notify = 0; int notify = 0;
int write_ok = 0;
int new_tele = 0; int new_tele = 0;
struct player *other; struct player *other;
@ -154,7 +155,12 @@ typed_wu(natid from, natid to, s_char *message, int type)
(write(fd, message, len) != len)) { (write(fd, message, len) != len)) {
#endif #endif
logerror("telegram 'write' to #%d failed", to); logerror("telegram 'write' to #%d failed", to);
} else if (type == TEL_ANNOUNCE) { } else
write_ok = 1;
if (close(fd) == -1) {
logerror("telegram 'write' to #%d failed to close.", to);
} else if (write_ok && type == TEL_ANNOUNCE) {
for (to = 0; NULL != (np = getnatp(to)); to++) { for (to = 0; NULL != (np = getnatp(to)); to++) {
if (!(np->nat_stat & STAT_NORM) && if (!(np->nat_stat & STAT_NORM) &&
!(np->nat_stat & STAT_SANCT)) !(np->nat_stat & STAT_SANCT))
@ -167,7 +173,7 @@ typed_wu(natid from, natid to, s_char *message, int type)
if (notify) if (notify)
player_wakeup_all(to); player_wakeup_all(to);
} }
} else { } else if (write_ok) {
notify = (np->nat_tgms == 0); notify = (np->nat_tgms == 0);
new_tele = telegram_is_new(to, &tel); new_tele = telegram_is_new(to, &tel);
np->nat_tgms += new_tele || notify; np->nat_tgms += new_tele || notify;
@ -185,6 +191,5 @@ typed_wu(natid from, natid to, s_char *message, int type)
player_wakeup_all(to); player_wakeup_all(to);
} }
close(fd);
return 0; return 0;
} }