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.22 by root, Sat Jan 16 13:41:37 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 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"
34
35struct logline
36{
37 struct timeval tv;
38 char *buf; // includes PREFIX_LEN garbage bytes
39 int len;
40 int flags;
41};
42
43static SMUTEX(mutex);
44static SCOND(cond);
45static int logfd = STDERR_FILENO;
46static int logsync = 1;
47static std::vector<logline, slice_allocator<logline> > queue;
48
49void set_logfd (int fd)
50{
51 SMUTEX_LOCK (mutex);
52 logfd = fd < 0 ? STDERR_FILENO : fd;
53 SMUTEX_UNLOCK (mutex);
54}
55
56#define PREFIX_LEN sizeof ("0000-00-00 00:00:00.0000+") - 1
57
58static void
59log_sync (logline &line)
60{
61 struct tm lt;
62 char pfx [PREFIX_LEN];
63
64 localtime_r (&line.tv.tv_sec, &lt);
65
66 sprintf (pfx, "%04d-%02d-%02d %02d:%02d:%02d.%04d",
67 lt.tm_year + 1900,
68 lt.tm_mon + 1,
69 lt.tm_mday,
70 lt.tm_hour,
71 lt.tm_min,
72 lt.tm_sec,
73 (int)(line.tv.tv_usec / 100)
74 );
75
76 pfx [PREFIX_LEN - 1] = line.flags & logSync ? '=' : ' ';
77
78 struct iovec iov [2];
79
80 iov [0].iov_base = pfx;
81 iov [0].iov_len = PREFIX_LEN;
82
83 char *buf = line.buf;
84
85 while (char *end = strchr (buf, '\n'))
86 {
87 iov [1].iov_base = buf;
88 iov [1].iov_len = end - buf + 1;
89
90 writev (STDERR_FILENO, iov, 2);
91 if (logfd != STDERR_FILENO)
92 writev (logfd, iov, 2);
93
94 buf = end + 1;
95
96 if (buf == line.buf + line.len)
97 break;
98
99 pfx [PREFIX_LEN - 1] = '+';
100 }
101
102 sfree (line.buf, line.len);
103}
104
105static void *
106logthread_proc (void *arg)
107{
108 int idx = 0;
109
110 for (;;)
111 {
112 logline line;
113
114 SMUTEX_LOCK (mutex);
115
116 while (queue.empty ())
117 SCOND_WAIT (cond, mutex);
118
119 line = queue [idx++];
120
121 // this algorithm could result in an ever-increasing vector
122 // size if we log faster than we can write, but if that happens
123 // we have bigger problems.
124 if (idx == queue.size ())
125 {
126 queue.clear ();
127 idx = 0;
128 }
129
130 SMUTEX_UNLOCK (mutex);
131
132 log_sync (line);
133 }
134}
28 135
29void 136void
137log_cleanup ()
138{
139 logsync = 1;
140
141 for (;;)
142 {
143 int done;
144
145 SMUTEX_LOCK (mutex);
146 done = queue.empty ();
147 SMUTEX_UNLOCK (mutex);
148
149 if (done)
150 break;
151
152 usleep (10000);
153 }
154}
155
156static void
157af_child ()
158{
159 logsync = 1;
160}
161
162static struct logthread : thread
163{
164 logthread ()
165 {
166 pthread_atfork (0, 0, af_child);
167 start (logthread_proc);
168 logsync = 0;
169 }
170} logthread;
171
172void
30LOG (int flags, const char *format, ...) 173LOG (int flags, const_utf8_string format, ...)
31{ 174{
32 int level = flags & 15; 175 int level = flags & 15;
33 176
34 if (level > settings.debug) 177 if (level > settings.debug)
35 return; 178 return;
36 179
37 char buf[20480]; 180 logline line;
38
39 struct timeval tv;
40 gettimeofday (&tv, 0); 181 gettimeofday (&line.tv, 0);
41 struct tm *ptime = localtime (&tv.tv_sec);
42 182
43 int len = strftime (buf, sizeof (buf) - 7, "%Y-%m-%d %H:%M:%S", ptime); 183 static dynbuf_text buf;
44 len += sprintf (buf + len, ".%04d ", (int)(tv.tv_usec / 100));
45 184
46 va_list ap; 185 va_list ap;
47 va_start (ap, format); 186 va_start (ap, format);
48 len += vsnprintf (buf + len, sizeof (buf) - len, format, ap); 187 buf.vprintf (format, ap);
49 va_end (ap); 188 va_end (ap);
50 189
51 len = min (sizeof (buf) - 1, len); 190 buf << '\n';
52 191
192 line.buf = buf.linearise ();
193 line.len = buf.size ();
194
53 if (buf [len - 1] != '\n') 195 if (line.buf [line.len - 2] == '\n')
54 buf [len++] = '\n'; // not 0-terminated 196 --line.len;
55 197
56 write (STDERR_FILENO, buf, len); 198 line.buf = salloc<char> (line.len, line.buf);
57 if (logfile != stderr) 199
58 fwrite (buf, 1, len, logfile); 200 buf.clear ();
201
202 if (logsync)
203 flags |= logSync;
59 204
60 if (flags & logBacktrace) 205 if (flags & logBacktrace)
206 {
207 line.buf [line.len - 1] = 0;
61 log_backtrace (buf); 208 log_backtrace (line.buf);
209 line.buf [line.len - 1] = '\n';
210 }
211
212 line.flags = flags;
213
214 if (line.flags & logSync)
215 log_sync (line);
216 else
217 {
218 SMUTEX_LOCK (mutex);
219 queue.push_back (line);
220 SMUTEX_UNLOCK (mutex);
221 SCOND_SIGNAL (cond);
222 }
62} 223}
224

Diff Legend

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