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

Diff Legend

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