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

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.54 by root, Fri Apr 27 20:06:37 2007 UTC vs.
Revision 1.108 by root, Sat Nov 17 23:40:00 2018 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
6 * Copyright (C) 1992 Frank Tore Johansen
7 * 6 *
8 * This program is free software; you can redistribute it and/or modify 7 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 8 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 9 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 10 * option) any later version.
12 * 11 *
13 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 15 * GNU General Public License for more details.
17 * 16 *
18 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 18 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 * <http://www.gnu.org/licenses/>.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/* 24/*
26 * General convenience functions for crossfire. 25 * General convenience functions for deliantra.
27 */ 26 */
28 27
29#include <cstdlib> 28#include <cstdlib>
30#include <sys/types.h> 29#include <sys/types.h>
31#include <unistd.h> 30#include <unistd.h>
32#include <sys/time.h> 31#include <sys/time.h>
33#include <time.h> 32#include <time.h>
34#include <signal.h> 33#include <signal.h>
35 34
36#include <global.h> 35#include <global.h>
37#include <funcpoint.h>
38#include <material.h> 36#include <material.h>
37#include <object.h>
38
39#include <sys/time.h>
40#include <sys/resource.h>
39 41
40#include <glib.h> 42#include <glib.h>
41 43
42rand_gen rndm; 44refcnt_base::refcnt_t refcnt_dummy;
45ssize_t slice_alloc;
43 46
44void 47/******************************************************************************/
45tausworthe_random_generator::seed (uint32_t seed)
46{
47 state [0] = seed * 69069U; if (state [0] < 2U) state [0] += 2U;
48 state [1] = state [0] * 69069U; if (state [0] < 8U) state [0] += 8U;
49 state [2] = state [1] * 69069U; if (state [0] < 16U) state [0] += 16U;
50 state [3] = state [2] * 69069U; if (state [0] < 128) state [0] += 128U;
51 48
52 for (int i = 11; --i; ) 49/* Checks a player-provided string which will become the msg property of
53 operator ()(); 50 * an object for dangerous input.
54}
55
56uint32_t
57tausworthe_random_generator::next ()
58{
59 state [0] = ((state [0] & 0xFFFFFFFEU) << 18U) ^ (((state [0] << 6U) ^ state [0]) >> 13U);
60 state [1] = ((state [1] & 0xFFFFFFF8U) << 2U) ^ (((state [1] << 2U) ^ state [1]) >> 27U);
61 state [2] = ((state [2] & 0xFFFFFFF0U) << 7U) ^ (((state [2] << 13U) ^ state [2]) >> 21U);
62 state [3] = ((state [3] & 0xFFFFFF80U) << 13U) ^ (((state [3] << 3U) ^ state [3]) >> 12U);
63
64 return state [0] ^ state [1] ^ state [2] ^ state [3];
65}
66
67uint32_t
68tausworthe_random_generator::get_range (uint32_t num)
69{
70 return (next () * (uint64_t)num) >> 32U;
71}
72
73// return a number within (min .. max)
74int
75tausworthe_random_generator::get_range (int r_min, int r_max)
76{
77 return r_min + get_range (max (r_max - r_min + 1, 0));
78}
79
80/*
81 * The random functions here take luck into account when rolling random
82 * dice or numbers. This function has less of an impact the larger the
83 * difference becomes in the random numbers. IE, the effect is lessened
84 * on a 1-1000 roll, vs a 1-6 roll. This can be used by crafty programmers,
85 * to specifically disable luck in certain rolls, simply by making the
86 * numbers larger (ie, 1d1000 > 500 vs 1d6 > 3)
87 */ 51 */
88 52bool
89/* 53msg_is_safe (const char *msg)
90 * Roll a random number between min and max. Uses op to determine luck,
91 * and if goodbad is non-zero, luck increases the roll, if zero, it decreases.
92 * Generally, op should be the player/caster/hitter requesting the roll,
93 * not the recipient (ie, the poor slob getting hit). [garbled 20010916]
94 */
95int
96random_roll (int r_min, int r_max, const object *op, int goodbad)
97{ 54{
98 int base = r_max - r_min > 1 ? 20 : 50; /* d2 and d3 are corner cases */ 55 bool safe = true;
99 56
100 if (r_max < 1 || r_max < r_min) 57 /* Trying to cheat by getting data into the object */
101 { 58 if (!strncmp (msg, "endmsg", sizeof ("endmsg") - 1)
102 LOG (llevError | logBacktrace, "Calling random_roll with min=%d max=%d\n", r_min, r_max); 59 || strstr (msg, "\nendmsg"))
103 return r_min; 60 safe = false;
104 }
105 61
106 if (op->type == PLAYER) 62 /* Trying to make the object talk, and potentially access arbitrary code */
107 { 63 if (object::msg_has_dialogue (msg))
108 int luck = op->stats.luck; 64 safe = false;
109 65
110 if (rndm (base) < min (10, abs (luck)))
111 {
112 //TODO: take luck into account
113 }
114 }
115
116 return rndm (r_min, r_max);
117}
118
119/*
120 * This is a 64 bit version of random_roll above. This is needed
121 * for exp loss calculations for players changing religions.
122 */
123sint64
124random_roll64 (sint64 min, sint64 max, const object *op, int goodbad)
125{
126 sint64 omin, diff, luck, ran;
127 int base;
128
129 omin = min;
130 diff = max - min + 1;
131 ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */
132
133 if (max < 1 || diff < 1)
134 {
135 LOG (llevError | logBacktrace, "Calling random_roll64 with min=%" PRId64 " max=%" PRId64 "\n", min, max);
136 return (min); /* avoids a float exception */
137 }
138
139 /*
140 * Make a call to get two 32 bit unsigned random numbers, and just to
141 * a little bitshifting.
142 */
143 ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31);
144
145 if (op->type != PLAYER)
146 return ((ran % diff) + min);
147
148 luck = op->stats.luck;
149 if (rndm (base) < MIN (10, abs (luck)))
150 {
151 /* we have a winner */
152 ((luck > 0) ? (luck = 1) : (luck = -1));
153 diff -= luck;
154 if (diff < 1)
155 return (omin); /*check again */
156 ((goodbad) ? (min += luck) : (diff));
157
158 return (MAX (omin, MIN (max, (ran % diff) + min)));
159 }
160
161 return ((ran % diff) + min);
162}
163
164/*
165 * Roll a number of dice (2d3, 4d6). Uses op to determine luck,
166 * If goodbad is non-zero, luck increases the roll, if zero, it decreases.
167 * Generally, op should be the player/caster/hitter requesting the roll,
168 * not the recipient (ie, the poor slob getting hit).
169 * The args are num D size (ie 4d6) [garbled 20010916]
170 */
171
172int
173die_roll (int num, int size, const object *op, int goodbad)
174{
175 int min, diff, luck, total, i, gotlucky, base;
176
177 diff = size;
178 min = 1;
179 luck = total = gotlucky = 0;
180 ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */
181 if (size < 2 || diff < 1)
182 {
183 LOG (llevError, "Calling die_roll with num=%d size=%d\n", num, size);
184 return (num); /* avoids a float exception */
185 }
186
187 if (op->type == PLAYER)
188 luck = op->stats.luck;
189
190 for (i = 0; i < num; i++)
191 {
192 if (rndm (base) < MIN (10, abs (luck)) && !gotlucky)
193 {
194 /* we have a winner */
195 gotlucky++;
196 ((luck > 0) ? (luck = 1) : (luck = -1));
197 diff -= luck;
198 if (diff < 1)
199 return (num); /*check again */
200 ((goodbad) ? (min += luck) : (diff));
201 total += MAX (1, MIN (size, rndm (diff) + min));
202 }
203 else
204 total += rndm (size) + 1;
205 }
206
207 return total;
208}
209
210/* decay and destroy perishable items in a map */
211void
212maptile::decay_objects ()
213{
214 if (!spaces)
215 return;
216
217 for (mapspace *ms = spaces + size (); ms-- > spaces; )
218 for (object *above, *op = ms->bot; op; op = above)
219 {
220 above = op->above;
221
222 bool destroy = 0;
223
224 // do not decay anything above unique floor tiles (yet :)
225 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
226 break;
227
228 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
229 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
230 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
231 || QUERY_FLAG (op, FLAG_UNIQUE)
232 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
233 || QUERY_FLAG (op, FLAG_UNPAID)
234 || op->is_alive ())
235 ; // do not decay
236 else if (op->is_weapon ())
237 {
238 op->stats.dam--;
239 if (op->stats.dam < 0)
240 destroy = 1;
241 }
242 else if (op->is_armor ())
243 {
244 op->stats.ac--;
245 if (op->stats.ac < 0)
246 destroy = 1;
247 }
248 else if (op->type == FOOD)
249 {
250 op->stats.food -= rndm (5, 20);
251 if (op->stats.food < 0)
252 destroy = 1;
253 }
254 else
255 {
256 int mat = op->materials;
257
258 if (mat & M_PAPER
259 || mat & M_LEATHER
260 || mat & M_WOOD
261 || mat & M_ORGANIC
262 || mat & M_CLOTH
263 || mat & M_LIQUID
264 || (mat & M_IRON && rndm (1, 5) == 1)
265 || (mat & M_GLASS && rndm (1, 2) == 1)
266 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
267 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
268 || (mat & M_ICE && temp > 32))
269 destroy = 1;
270 }
271
272 /* adjust overall chance below */
273 if (destroy && rndm (0, 1))
274 op->destroy ();
275 }
276}
277
278/* convert materialname to materialtype_t */
279
280materialtype_t *
281name_to_material (const shstr &name)
282{
283 for (materialtype_t *mt = materialt; mt && mt->next; mt = mt->next)
284 if (name == mt->name)
285 return mt;
286
287 return materialt;
288}
289
290/* when doing transmutation of objects, we have to recheck the resistances,
291 * as some that did not apply previously, may apply now.
292 */
293
294void
295transmute_materialname (object *op, const object *change)
296{
297 materialtype_t *mt;
298 int j;
299
300 if (op->materialname == NULL)
301 return;
302
303 if (change->materialname != NULL && strcmp (op->materialname, change->materialname))
304 return;
305
306 if (!op->is_armor ())
307 return;
308
309 mt = name_to_material (op->materialname);
310 if (!mt)
311 {
312 LOG (llevError, "archetype '%s>%s' uses nonexistent material '%s'\n", &op->arch->name, &op->name, &op->materialname);
313 return;
314 }
315
316 for (j = 0; j < NROFATTACKS; j++)
317 if (op->resist[j] == 0 && change->resist[j] != 0)
318 {
319 op->resist[j] += mt->mod[j];
320 if (op->resist[j] > 100)
321 op->resist[j] = 100;
322 if (op->resist[j] < -100)
323 op->resist[j] = -100;
324 }
325}
326
327/* set the materialname and type for an item */
328void
329set_materialname (object *op, int difficulty, materialtype_t *nmt)
330{
331 materialtype_t *mt, *lmt;
332
333#ifdef NEW_MATERIAL_CODE
334 int j;
335#endif
336
337 if (op->materialname != NULL)
338 return;
339
340
341
342 if (nmt == NULL)
343 {
344 lmt = NULL;
345#ifndef NEW_MATERIAL_CODE
346 for (mt = materialt; mt && mt->next; mt = mt->next)
347 {
348 if (op->materials & mt->material)
349 {
350 lmt = mt;
351 break;
352 }
353 }
354
355#else
356 for (mt = materialt; mt && mt->next; mt = mt->next)
357 {
358 if (op->materials & mt->material && rndm (1, 100) <= mt->chance &&
359 difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
360 {
361 lmt = mt;
362 if (!(op->is_weapon () || op->is_armor ()))
363 break;
364 }
365 }
366#endif
367 }
368 else
369 {
370 lmt = nmt;
371 }
372
373 if (lmt != NULL)
374 {
375#ifndef NEW_MATERIAL_CODE
376 op->materialname = lmt->name;
377 return;
378#else
379
380 if (op->stats.dam && op->is_weapon ())
381 {
382 op->stats.dam += lmt->damage;
383 if (op->stats.dam < 1)
384 op->stats.dam = 1;
385 }
386
387 if (op->stats.sp && op->type == BOW)
388 op->stats.sp += lmt->sp;
389 if (op->stats.wc && op->is_weapon ())
390 op->stats.wc += lmt->wc;
391 if (op->is_armor ())
392 {
393 if (op->stats.ac)
394 op->stats.ac += lmt->ac;
395 for (j = 0; j < NROFATTACKS; j++)
396 if (op->resist[j] != 0)
397 {
398 op->resist[j] += lmt->mod[j];
399 if (op->resist[j] > 100)
400 op->resist[j] = 100;
401 if (op->resist[j] < -100)
402 op->resist[j] = -100;
403 }
404 }
405 op->materialname = lmt->name;
406 /* dont make it unstackable if it doesn't need to be */
407 if (op->is_weapon () || op->is_armor ())
408 {
409 op->weight = (op->weight * lmt->weight) / 100;
410 op->value = (op->value * lmt->value) / 100;
411 }
412#endif
413 }
414}
415
416/*
417 * Strip out the media tags from a String.
418 * Warning the input string will contain the result string
419 */
420void
421strip_media_tag (char *message)
422{
423 int in_tag = 0;
424 char *dest;
425 char *src;
426
427 src = dest = message;
428 while (*src != '\0')
429 {
430 if (*src == '[')
431 {
432 in_tag = 1;
433 }
434 else if (in_tag && (*src == ']'))
435 in_tag = 0;
436 else if (!in_tag)
437 {
438 *dest = *src;
439 dest++;
440 }
441 src++;
442 }
443 *dest = '\0';
444}
445
446const char *
447strrstr (const char *haystack, const char *needle)
448{
449 const char *lastneedle;
450
451 lastneedle = NULL;
452 while ((haystack = strstr (haystack, needle)) != NULL)
453 {
454 lastneedle = haystack;
455 haystack++;
456 }
457 return lastneedle;
458
459}
460
461#define EOL_SIZE (sizeof("\n")-1)
462void
463strip_endline (char *buf)
464{
465 if (strlen (buf) < sizeof ("\n"))
466 {
467 return;
468 }
469 if (!strcmp (buf + strlen (buf) - EOL_SIZE, "\n"))
470 buf[strlen (buf) - EOL_SIZE] = '\0';
471}
472
473/**
474 * Replace in string src all occurrences of key by replacement. The resulting
475 * string is put into result; at most resultsize characters (including the
476 * terminating null character) will be written to result.
477 */
478void
479replace (const char *src, const char *key, const char *replacement, char *result, size_t resultsize)
480{
481 size_t resultlen;
482 size_t keylen;
483
484 /* special case to prevent infinite loop if key==replacement=="" */
485 if (strcmp (key, replacement) == 0)
486 {
487 snprintf (result, resultsize, "%s", src);
488 return;
489 }
490
491 keylen = strlen (key);
492
493 resultlen = 0;
494 while (*src != '\0' && resultlen + 1 < resultsize)
495 {
496 if (strncmp (src, key, keylen) == 0)
497 {
498 snprintf (result + resultlen, resultsize - resultlen, "%s", replacement);
499 resultlen += strlen (result + resultlen);
500 src += keylen;
501 }
502 else
503 {
504 result[resultlen++] = *src++;
505 }
506 }
507 result[resultlen] = '\0';
508}
509
510/**
511 * Taking a string as an argument, mutate it into a string that looks like a list.
512 * a 'list' for the purposes here, is a string of items, seperated by commas, except
513 * for the last entry, which has an 'and' before it, and a full stop (period) after it.
514 * This function will also strip all trailing non alphanumeric characters.
515 * It does not insert an oxford comma.
516 */
517
518void
519make_list_like (char *input)
520{
521 char *p, tmp[MAX_BUF];
522 int i;
523
524 if (!input || strlen (input) > MAX_BUF - 5)
525 return;
526 /* bad stuff would happen if we continued here, the -5 is to make space for ' and ' */
527
528 strncpy (tmp, input, MAX_BUF - 5);
529 /*trim all trailing commas, spaces etc. */
530 for (i = strlen (tmp); !isalnum (tmp[i]) && i >= 0; i--)
531 tmp[i] = '\0';
532
533 strcat (tmp, ".");
534
535 p = strrchr (tmp, ',');
536 if (p)
537 {
538 *p = '\0';
539 strcpy (input, tmp);
540 p++;
541 strcat (input, " and");
542 strcat (input, p);
543 }
544 else
545 strcpy (input, tmp);
546
547 return; 66 return safe;
548} 67}
549 68
550///////////////////////////////////////////////////////////////////////////// 69/////////////////////////////////////////////////////////////////////////////
551 70
552void 71void
553fork_abort (const char *msg) 72fork_abort (const char *msg)
554{ 73{
555 if (!fork ()) 74 if (!fork ())
556 { 75 {
76 signal (SIGINT , SIG_IGN);
77 signal (SIGTERM, SIG_IGN);
557 signal (SIGABRT, SIG_DFL); 78 signal (SIGABRT, SIG_IGN);
79
80 signal (SIGSEGV, SIG_DFL);
81 signal (SIGFPE , SIG_DFL);
82#ifdef SIGBUS
83 signal (SIGBUS , SIG_DFL);
84#endif
85 signal (SIGILL , SIG_DFL);
86 signal (SIGTRAP, SIG_DFL);
87
558 // try to put corefiles into a subdirectory, if existing, to allow 88 // try to put corefiles into a subdirectory, if existing, to allow
559 // an administrator to reduce the I/O load. 89 // an administrator to reduce the I/O load.
560 chdir ("cores"); 90 chdir ("cores");
91
92 // try to detach us from as many external dependencies as possible
93 // as coredumping can take time by closing all fd's.
94 {
95 struct rlimit lim;
96
97 if (getrlimit (RLIMIT_NOFILE, &lim))
98 lim.rlim_cur = 1024;
99
100 for (int i = 0; i < lim.rlim_cur; ++i)
101 close (i);
102 }
103
104 {
105 sigset_t empty;
106 sigemptyset (&empty);
107 sigprocmask (SIG_SETMASK, &empty, 0);
108 }
109
110 // try to coredump with SIGTRAP
111 kill (getpid (), SIGTRAP);
561 abort (); 112 abort ();
562 } 113 }
563 114
564 LOG (llevError, "fork abort: %s\n", msg); 115 LOG (llevError, "fork abort: %s\n", msg);
565} 116}
566 117
567void *salloc_ (int n) throw (std::bad_alloc) 118void *
119salloc_ (int n)
568{ 120{
569#ifdef PREFER_MALLOC
570 void *ptr = malloc (n);
571#else
572 void *ptr = g_slice_alloc (n); 121 void *ptr = g_slice_alloc (n);
573#endif
574 122
575 if (!ptr) 123 if (!ptr)
576 throw std::bad_alloc (); 124 throw std::bad_alloc ();
577 125
126 slice_alloc += n;
578 return ptr; 127 return ptr;
579} 128}
580 129
581void *salloc_ (int n, void *src) throw (std::bad_alloc) 130void *
131salloc_ (int n, void *src)
582{ 132{
583 void *ptr = salloc_ (n); 133 void *ptr = salloc_ (n);
584 134
585 if (src) 135 if (src)
586 memcpy (ptr, src, n); 136 memcpy (ptr, src, n);
… …
588 memset (ptr, 0, n); 138 memset (ptr, 0, n);
589 139
590 return ptr; 140 return ptr;
591} 141}
592 142
143/******************************************************************************/
144
145#if DEBUG_SALLOC
146
147#define MAGIC 0xa1b2c35543deadLL
148
149void *
150g_slice_alloc (unsigned long size)
151{
152 unsigned long *p = (unsigned long *) (g_slice_alloc)(size + sizeof (unsigned long));
153 *p++ = size ^ MAGIC;
154 //fprintf (stderr, "g_slice_alloc %ld %p\n", size, p);//D
155 return (void *)p;
156}
157
158void *
159g_slice_alloc0 (unsigned long size)
160{
161 return memset (g_slice_alloc (size), 0, size);
162}
163
164void
165g_slice_free1 (unsigned long size, void *ptr)
166{
167 //fprintf (stderr, "g_slice_free %ld %p\n", size, ptr);//D
168 if (expect_true (ptr))
169 {
170 unsigned long *p = (unsigned long *)ptr;
171 unsigned long s = *--p ^ MAGIC;
172
173 if (size != (unsigned long)(*p ^ MAGIC))
174 {
175 LOG (logBacktrace | llevError, "slice free size (%lx) doesn't match alloc size (%lx)\n", size, s);
176 abort ();
177 }
178
179 *p = MAGIC;
180
181 (g_slice_free1)(s + sizeof (unsigned long), p);
182 }
183}
184
185#endif
186
187/******************************************************************************/
188
189refcnt_buf::refcnt_buf (size_t size)
190{
191 static uint32_t empty_buf [2] = { 0, 1 }; // 2 == never deallocated
192 data = (char *)empty_buf + overhead;
193 assert (overhead == sizeof (empty_buf));
194 inc ();
195}
196
197refcnt_buf::refcnt_buf (void *data, size_t size)
198{
199 _alloc (size);
200 memcpy (this->data, data, size);
201}
202
203refcnt_buf::~refcnt_buf ()
204{
205 dec ();
206}
207
208void
209refcnt_buf::_dealloc ()
210{
211 sfree<char> (data - overhead, size () + overhead);
212}
213
214refcnt_buf &
215refcnt_buf::operator =(const refcnt_buf &src)
216{
217 dec ();
218 data = src.data;
219 inc ();
220 return *this;
221}
222
223/******************************************************************************/
224
225int
593void assign (char *dst, const char *src, int maxlen) 226assign (char *dst, const char *src, int maxsize)
594{ 227{
595 if (!src) 228 if (!src)
596 src = ""; 229 src = "";
597 230
598 int len = strlen (src); 231 int len = strlen (src);
599 232
600 if (len >= maxlen - 1) 233 if (len >= maxsize)
601 { 234 {
602 if (maxlen <= 4) 235 if (maxsize <= 4)
603 { 236 {
604 memset (dst, '.', maxlen - 1); 237 memset (dst, '.', maxsize - 2);
605 dst [maxlen - 1] = 0; 238 dst [maxsize - 1] = 0;
606 } 239 }
607 else 240 else
608 { 241 {
609 memcpy (dst, src, maxlen - 4); 242 memcpy (dst, src, maxsize - 4);
610 memcpy (dst + maxlen - 4, "...", 4); 243 memcpy (dst + maxsize - 4, "...", 4);
611 } 244 }
245
246 len = maxsize;
612 } 247 }
613 else 248 else
614 memcpy (dst, src, len + 1); 249 memcpy (dst, src, ++len);
615}
616 250
617const std::string 251 return len;
252}
253
254char *
255vformat (const char *format, va_list ap)
256{
257 static dynbuf_text bufs[8];
258 static int bufidx;
259
260 dynbuf_text &buf = bufs [++bufidx & 7];
261
262 buf.clear ();
263 buf.vprintf (format, ap);
264 return buf;
265}
266
267char *
618format (const char *format, ...) 268format (const char *format, ...)
619{ 269{
620 int len;
621
622 {
623 char buf[128];
624
625 va_list ap; 270 va_list ap;
626 va_start (ap, format); 271 va_start (ap, format);
627 len = vsnprintf (buf, sizeof (buf), format, ap); 272 char *buf = vformat (format, ap);
628 va_end (ap); 273 va_end (ap);
629 274
630 assert (len >= 0); // shield againstz broken vsnprintf's
631
632 // was our static buffer short enough?
633 if (len < sizeof (buf))
634 return std::string (buf, len);
635 }
636
637 {
638 // longer, try harder
639 char *buf = salloc<char> (len + 1);
640
641 va_list ap;
642 va_start (ap, format);
643 vsnprintf (buf, len + 1, format, ap);
644 va_end (ap);
645
646 const std::string s (buf, len);
647 sfree<char> (buf, len + 1);
648
649 return buf; 275 return buf;
650 }
651} 276}
652 277
653tstamp now () 278tstamp
279now ()
654{ 280{
655 struct timeval tv; 281 struct timeval tv;
656 282
657 gettimeofday (&tv, 0); 283 gettimeofday (&tv, 0);
658 return tstamp (tv.tv_sec) + tstamp (tv.tv_usec) * tstamp (1e-6); 284 return tstamp (tv.tv_sec) + tstamp (tv.tv_usec) * tstamp (1e-6);
… …
723 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL, 349 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
724 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL, 350 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
725 0x2d02ef8dL 351 0x2d02ef8dL
726}; 352};
727 353
354void
355thread::start (void *(*start_routine)(void *), void *arg)
356{
357 pthread_attr_t attr;
728 358
359 pthread_attr_init (&attr);
360 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
361 pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN < sizeof (long) * 4096
362 ? sizeof (long) * 4096 : PTHREAD_STACK_MIN);
363#ifdef PTHREAD_SCOPE_PROCESS
364 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
365#endif
366
367 sigset_t fullsigset, oldsigset;
368 sigfillset (&fullsigset);
369
370 pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
371
372 if (pthread_create (&id, &attr, start_routine, arg))
373 cleanup ("unable to create a new thread");
374
375 pthread_sigmask (SIG_SETMASK, &oldsigset, 0);
376}
377

Diff Legend

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