ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/logger.C
(Generate patch)

Comparing deliantra/server/common/logger.C (file contents):
Revision 1.23 by root, Fri Mar 26 01:04:44 2010 UTC vs.
Revision 1.24 by root, Sun Apr 11 17:27:51 2010 UTC

… …
39 int len; 39 int len;
40 int flags; 40 int flags;
41}; 41};
42 42
43static SMUTEX(mutex); 43static SMUTEX(mutex);
44static SMUTEX(fdlock);
44static SCOND(cond); 45static SCOND(cond);
45static int logfd = STDERR_FILENO; 46static int logfd = STDERR_FILENO;
46static int logsync = 1; 47static int logsync = 1;
47static std::vector<logline, slice_allocator<logline> > queue; 48static std::vector<logline, slice_allocator<logline> > queue;
48 49
49void set_logfd (int fd) 50int log_setfd (int fd)
50{ 51{
51 SMUTEX_LOCK (mutex); 52 SMUTEX_LOCK (fdlock);
53 int old = logfd;
52 logfd = fd < 0 ? STDERR_FILENO : fd; 54 logfd = fd < 0 ? STDERR_FILENO : fd;
53 SMUTEX_UNLOCK (mutex); 55 SMUTEX_UNLOCK (fdlock);
56
57 return old;
54} 58}
55 59
56#define PREFIX_LEN sizeof ("0000-00-00 00:00:00.0000+") - 1 60#define PREFIX_LEN sizeof ("0000-00-00 00:00:00.0000+") - 1
57 61
58static void 62static void
… …
80 iov [0].iov_base = pfx; 84 iov [0].iov_base = pfx;
81 iov [0].iov_len = PREFIX_LEN; 85 iov [0].iov_len = PREFIX_LEN;
82 86
83 char *buf = line.buf; 87 char *buf = line.buf;
84 88
89 if (logsync != 2)
90 SMUTEX_LOCK (fdlock);
91
85 while (char *end = strchr (buf, '\n')) 92 while (char *end = strchr (buf, '\n'))
86 { 93 {
87 iov [1].iov_base = buf; 94 iov [1].iov_base = buf;
88 iov [1].iov_len = end - buf + 1; 95 iov [1].iov_len = end - buf + 1;
89 96
… …
96 if (buf == line.buf + line.len) 103 if (buf == line.buf + line.len)
97 break; 104 break;
98 105
99 pfx [PREFIX_LEN - 1] = '+'; 106 pfx [PREFIX_LEN - 1] = '+';
100 } 107 }
108
109 if (logsync != 2)
110 SMUTEX_UNLOCK (fdlock);
101 111
102 sfree (line.buf, line.len); 112 sfree (line.buf, line.len);
103} 113}
104 114
105static void * 115static void *
… …
148 158
149 if (done) 159 if (done)
150 break; 160 break;
151 161
152 usleep (10000); 162 usleep (10000);
163 SMUTEX_LOCK (fdlock);
164 SMUTEX_UNLOCK (fdlock);
153 } 165 }
154} 166}
155 167
156static void 168static void
157af_child () 169af_child ()
158{ 170{
159 logsync = 1; 171 logsync = 2;
160} 172}
161 173
162static struct logthread : thread 174static struct logthread : thread
163{ 175{
164 logthread () 176 logthread ()
… …
220 SMUTEX_UNLOCK (mutex); 232 SMUTEX_UNLOCK (mutex);
221 SCOND_SIGNAL (cond); 233 SCOND_SIGNAL (cond);
222 } 234 }
223} 235}
224 236
237static int suspended;
238
239void
240log_suspend ()
241{
242 if (!suspended++)
243 {
244 LOG (llevDebug, "logging suspended.");
245 SMUTEX_LOCK (fdlock);
246 }
247}
248
249void
250log_resume ()
251{
252 if (!--suspended)
253 {
254 SMUTEX_UNLOCK (fdlock);
255 LOG (llevDebug, "logging resumed.");
256 }
257}
258

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines