emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syslogs: a bit better wording in explanation how buffering

Browse Source 
is allocated
This commit is contained in:
Denis Vlasenko 2007-01-06 22:08:53 +00:00
parent ea9e35f5dd
commit 8a820b2732
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sysklogd/syslogd.c
View File

@ -58,16 +58,16 @@ static struct sockaddr_in remoteAddr;
/* We are using bb_common_bufsiz1 for buffering: */ /* We are using bb_common_bufsiz1 for buffering: */
enum { MAX_READ = (BUFSIZ/6) & ~0xf }; enum { MAX_READ = (BUFSIZ/6) & ~0xf };
/* We recv into this... (size: MAX_READ ~== BUFSIZ/6) */ /* We recv into RECVBUF... (size: MAX_READ ~== BUFSIZ/6) */
#define RECVBUF bb_common_bufsiz1 #define RECVBUF bb_common_bufsiz1
/* ...then copy here, escaping control chars */ /* ...then copy to PARSEBUF, escaping control chars */
/* (can grow x2 + 1 max ~== BUFSIZ/3) */ /* (can grow x2 max ~== BUFSIZ/3) */
#define PARSEBUF (bb_common_bufsiz1 + MAX_READ) #define PARSEBUF (bb_common_bufsiz1 + MAX_READ)
/* ...then sprintf into this, adding timestamp (15 chars), /* ...then sprintf into PRINTBUF, adding timestamp (15 chars),
* host (64), fac.prio (20) to the message */ * host (64), fac.prio (20) to the message */
/* (growth by: 15 + 64 + 20 + delims = ~110) */ /* (growth by: 15 + 64 + 20 + delims = ~110) */
#define PRINTBUF (bb_common_bufsiz1 + 3*MAX_READ + 0x10) #define PRINTBUF (bb_common_bufsiz1 + 3*MAX_READ)
/* totals: BUFSIZ/6 + BUFSIZ/3 + BUFSIZ/3 = BUFSIZ - BUFSIZ/6 /* totals: BUFSIZ == BUFSIZ/6 + BUFSIZ/3 + (BUFSIZ/3+BUFSIZ/6)
* -- we have BUFSIZ/6 extra at the ent of PRINTBUF * -- we have BUFSIZ/6 extra at the ent of PRINTBUF
* which covers needed ~110 extra bytes (and much more) */ * which covers needed ~110 extra bytes (and much more) */
@ -467,7 +467,7 @@ static void do_syslogd(void)
int sock_fd; int sock_fd;
fd_set fds; fd_set fds;
/* Set up signal handlers. */ /* Set up signal handlers */
signal(SIGINT, quit_signal); signal(SIGINT, quit_signal);
signal(SIGTERM, quit_signal); signal(SIGTERM, quit_signal);
signal(SIGQUIT, quit_signal); signal(SIGQUIT, quit_signal);
@ -510,7 +510,7 @@ static void do_syslogd(void)
if (select(sock_fd + 1, &fds, NULL, NULL, NULL) < 0) { if (select(sock_fd + 1, &fds, NULL, NULL, NULL) < 0) {
if (errno == EINTR) { if (errno == EINTR) {
/* alarm may have happened. */ /* alarm may have happened */
continue; continue;
} }
bb_perror_msg_and_die("select"); bb_perror_msg_and_die("select");
@ -604,6 +604,5 @@ int syslogd_main(int argc, char **argv)
} }
umask(0); umask(0);
do_syslogd(); do_syslogd();
/* return EXIT_SUCCESS; */
return EXIT_SUCCESS;
} }