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.14 by root, Sat Jun 9 23:18:17 2007 UTC vs.
Revision 1.19 by root, Tue May 6 16:55:25 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <cstdarg> 24#include <cstdarg>
25#include <cstring>
26
27#include <vector>
28
29#include <sys/uio.h>
30#include <pthread.h>
31
26#include <global.h> 32#include "global.h"
27#include <funcpoint.h> 33#include "dynbuf.h"
34#include "util.h"
35
36struct logline
37{
38 struct timeval tv;
39 char *buf; // includes PREFIX_LEN garbage bytes
40 int len;
41 int flags;
42};
43
44static SMUTEX(mutex);
45static SCOND(cond);
46static int logfd = STDERR_FILENO;
47static int logsync = 1;
48static std::vector<logline, slice_allocator<logline> > queue;
49
50void set_logfd (int fd)
51{
52 SMUTEX_LOCK (mutex);
53 logfd = fd < 0 ? STDERR_FILENO : fd;
54 SMUTEX_UNLOCK (mutex);
55}
56
57#define PREFIX_LEN sizeof ("0000-00-00 00:00:00.0000+") - 1
58
59static void
60log_sync (logline &line)
61{
62 struct tm lt;
63 char pfx [PREFIX_LEN];
64
65 localtime_r (&line.tv.tv_sec, &lt);
66
67 sprintf (pfx, "%04d-%02d-%02d %02d:%02d:%02d.%04d",
68 lt.tm_year + 1900,
69 lt.tm_mon + 1,
70 lt.tm_mday,
71 lt.tm_hour,
72 lt.tm_min,
73 lt.tm_sec,
74 (int)(line.tv.tv_usec / 100)
75 );
76
77 pfx [PREFIX_LEN - 1] = line.flags & logSync ? '=' : ' ';
78
79 struct iovec iov [2];
80
81 iov [0].iov_base = pfx;
82 iov [0].iov_len = PREFIX_LEN;
83
84 char *buf = line.buf;
85
86 while (char *end = strchr (buf, '\n'))
87 {
88 iov [1].iov_base = buf;
89 iov [1].iov_len = end - buf + 1;
90
91 writev (STDERR_FILENO, iov, 2);
92 if (logfd != STDERR_FILENO)
93 writev (logfd, iov, 2);
94
95 buf = end + 1;
96
97 if (buf == line.buf + line.len)
98 break;
99
100 pfx [PREFIX_LEN - 1] = '+';
101 }
102
103 sfree (line.buf, line.len);
104}
105
106static void *
107logthread_proc (void *arg)
108{
109 int idx = 0;
110
111 for (;;)
112 {
113 logline line;
114
115 SMUTEX_LOCK (mutex);
116
117 while (queue.empty ())
118 SCOND_WAIT (cond, mutex);
119
120 line = queue [idx++];
121
122 // this algorithm could result in an ever-increasing vector
123 // size if we log faster than we can write, but if that happens
124 // we have bigger problems.
125 if (idx == queue.size ())
126 {
127 queue.clear ();
128 idx = 0;
129 }
130
131 SMUTEX_UNLOCK (mutex);
132
133 log_sync (line);
134 }
135}
136
137void
138log_cleanup ()
139{
140 logsync = 1;
141
142 for (;;)
143 {
144 int done;
145
146 SMUTEX_LOCK (mutex);
147 done = queue.empty ();
148 SMUTEX_UNLOCK (mutex);
149
150 if (done)
151 break;
152
153 usleep (10000);
154 }
155}
156
157static void
158af_child ()
159{
160 logsync = 1;
161}
162
163static struct logthread : thread
164{
165 logthread ()
166 {
167 pthread_atfork (0, 0, af_child);
168 start (logthread_proc);
169 logsync = 0;
170 }
171} logthread;
28 172
29void 173void
30LOG (int flags, const char *format, ...) 174LOG (int flags, const char *format, ...)
31{ 175{
32 int level = flags & 15; 176 int level = flags & 15;
33 177
34 if (level > settings.debug) 178 if (level > settings.debug)
35 return; 179 return;
36 180
37 char buf[20480]; 181 logline line;
38
39 struct timeval tv;
40 gettimeofday (&tv, 0); 182 gettimeofday (&line.tv, 0);
41 struct tm *ptime = localtime (&tv.tv_sec);
42 183
43 int len = strftime (buf, sizeof (buf) - 7, "%Y-%m-%d %H:%M:%S", ptime); 184 static dynbuf_text buf;
44 len += sprintf (buf + len, ".%04d ", (int)(tv.tv_usec / 100));
45 185
46 va_list ap; 186 va_list ap;
47 va_start (ap, format); 187 va_start (ap, format);
48 len += vsnprintf (buf + len, sizeof (buf) - len, format, ap); 188 buf.vprintf (format, ap);
49 va_end (ap); 189 va_end (ap);
50 190
51 len = min (sizeof (buf) - 1, len); 191 buf << '\n';
52 192
193 line.buf = buf.linearise ();
194 line.len = buf.size ();
195
53 if (buf [len - 1] != '\n') 196 if (line.buf [line.len - 2] == '\n')
54 buf [len++] = '\n'; // not 0-terminated 197 --line.len;
55 198
56 write (STDERR_FILENO, buf, len); 199 line.buf = salloc<char> (line.len, line.buf);
57 if (logfile != stderr) 200
58 fwrite (buf, 1, len, logfile); 201 buf.clear ();
202
203 if (logsync)
204 flags |= logSync;
59 205
60 if (flags & logBacktrace) 206 if (flags & logBacktrace)
207 {
208 line.buf [line.len - 1] = 0;
61 log_backtrace (buf); 209 log_backtrace (line.buf);
210 line.buf [line.len - 1] = '\n';
211 }
212
213 line.flags = flags;
214
215 if (line.flags & logSync)
216 log_sync (line);
217 else
218 {
219 SMUTEX_LOCK (mutex);
220 queue.push_back (line);
221 SMUTEX_UNLOCK (mutex);
222 SCOND_SIGNAL (cond);
223 }
62} 224}
225

Diff Legend

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