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

Diff Legend

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