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.56 by root, Thu May 17 21:32:08 2007 UTC vs.
Revision 1.88 by root, Sun Oct 11 05:31:54 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 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 (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) 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, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License 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 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
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 crossfire.
27 */ 26 */
… …
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;
46rand_gen rndm, rmg_rndm;
43 47
44void 48void
45tausworthe_random_generator::seed (uint32_t seed) 49tausworthe_random_generator::seed (uint32_t seed)
46{ 50{
47 state [0] = seed * 69069U; if (state [0] < 2U) state [0] += 2U; 51 state [0] = seed * 69069U; if (state [0] < 2U) state [0] += 2U;
48 state [1] = state [0] * 69069U; if (state [0] < 8U) state [0] += 8U; 52 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; 53 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; 54 state [3] = state [2] * 69069U; if (state [0] < 128U) state [0] += 128U;
51 55
52 for (int i = 11; --i; ) 56 for (int i = 11; --i; )
53 operator ()(); 57 next ();
54} 58}
55 59
56uint32_t 60uint32_t
57tausworthe_random_generator::next () 61tausworthe_random_generator::next ()
58{ 62{
… …
62 state [3] = ((state [3] & 0xFFFFFF80U) << 13U) ^ (((state [3] << 3U) ^ state [3]) >> 12U); 66 state [3] = ((state [3] & 0xFFFFFF80U) << 13U) ^ (((state [3] << 3U) ^ state [3]) >> 12U);
63 67
64 return state [0] ^ state [1] ^ state [2] ^ state [3]; 68 return state [0] ^ state [1] ^ state [2] ^ state [3];
65} 69}
66 70
71template<class generator>
67uint32_t 72uint32_t
68tausworthe_random_generator::get_range (uint32_t num) 73random_number_generator<generator>::get_range (uint32_t num)
69{ 74{
70 return (next () * (uint64_t)num) >> 32U; 75 return (this->next () * (uint64_t)num) >> 32U;
71} 76}
72 77
73// return a number within (min .. max) 78// return a number within (min .. max)
79template<class generator>
74int 80int
75tausworthe_random_generator::get_range (int r_min, int r_max) 81random_number_generator<generator>::get_range (int r_min, int r_max)
76{ 82{
77 return r_min + get_range (max (r_max - r_min + 1, 0)); 83 return r_min + get_range (max (r_max - r_min + 1, 0));
78} 84}
85
86template struct random_number_generator<tausworthe_random_generator>;
87template struct random_number_generator<xorshift_random_generator>;
79 88
80/* 89/*
81 * The random functions here take luck into account when rolling random 90 * 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 91 * 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 92 * difference becomes in the random numbers. IE, the effect is lessened
… …
93 * not the recipient (ie, the poor slob getting hit). [garbled 20010916] 102 * not the recipient (ie, the poor slob getting hit). [garbled 20010916]
94 */ 103 */
95int 104int
96random_roll (int r_min, int r_max, const object *op, int goodbad) 105random_roll (int r_min, int r_max, const object *op, int goodbad)
97{ 106{
107 r_max = max (r_min, r_max);
108
98 int base = r_max - r_min > 1 ? 20 : 50; /* d2 and d3 are corner cases */ 109 int base = r_max - r_min > 1 ? 20 : 50; /* d2 and d3 are corner cases */
99
100 if (r_max < r_min)
101 {
102 LOG (llevError | logBacktrace, "Calling random_roll with min=%d max=%d\n", r_min, r_max);
103 return r_min;
104 }
105 110
106 if (op->type == PLAYER) 111 if (op->type == PLAYER)
107 { 112 {
108 int luck = op->stats.luck; 113 int luck = op->stats.luck;
109 114
… …
119/* 124/*
120 * This is a 64 bit version of random_roll above. This is needed 125 * This is a 64 bit version of random_roll above. This is needed
121 * for exp loss calculations for players changing religions. 126 * for exp loss calculations for players changing religions.
122 */ 127 */
123sint64 128sint64
124random_roll64 (sint64 min, sint64 max, const object *op, int goodbad) 129random_roll64 (sint64 r_min, sint64 r_max, const object *op, int goodbad)
125{ 130{
126 sint64 omin = min; 131 sint64 omin = r_min;
127 sint64 diff = max - min + 1; 132 sint64 range = max (0, r_max - r_min + 1);
128 int base = diff > 2 ? 20 : 50; /* d2 and d3 are corner cases */ 133 int base = range > 2 ? 20 : 50; /* d2 and d3 are corner cases */
129
130 if (diff < 0)
131 {
132 LOG (llevError | logBacktrace, "Calling random_roll64 with min=%" PRId64 " max=%" PRId64 "\n", min, max);
133 return (min); /* avoids a float exception */
134 }
135 134
136 /* 135 /*
137 * Make a call to get two 32 bit unsigned random numbers, and just to 136 * Make a call to get two 32 bit unsigned random numbers, and just to
138 * a little bitshifting. 137 * a little bitshifting.
139 */ 138 */
140 sint64 ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31); 139 sint64 ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31);
141 140
142 if (op->type != PLAYER) 141 if (op->type != PLAYER)
143 return ((ran % diff) + min); 142 return ((ran % range) + r_min);
144 143
145 int luck = op->stats.luck; 144 int luck = op->stats.luck;
146 145
147 if (rndm (base) < MIN (10, abs (luck))) 146 if (rndm (base) < min (10, abs (luck)))
148 { 147 {
149 /* we have a winner */ 148 /* we have a winner */
150 ((luck > 0) ? (luck = 1) : (luck = -1)); 149 ((luck > 0) ? (luck = 1) : (luck = -1));
151 diff -= luck; 150 range -= luck;
152 if (diff < 1) 151 if (range < 1)
153 return (omin); /*check again */ 152 return (omin); /*check again */
154 153
155 ((goodbad) ? (min += luck) : (diff)); 154 ((goodbad) ? (r_min += luck) : (range));
156 155
157 return (MAX (omin, MIN (max, (ran % diff) + min))); 156 return (max (omin, min (r_max, (ran % range) + r_min)));
158 } 157 }
159 158
160 return ran % diff + min; 159 return ran % range + r_min;
161} 160}
162 161
163/* 162/*
164 * Roll a number of dice (2d3, 4d6). Uses op to determine luck, 163 * Roll a number of dice (2d3, 4d6). Uses op to determine luck,
165 * If goodbad is non-zero, luck increases the roll, if zero, it decreases. 164 * If goodbad is non-zero, luck increases the roll, if zero, it decreases.
… …
204 } 203 }
205 204
206 return total; 205 return total;
207} 206}
208 207
209/* decay and destroy perishable items in a map */
210void
211maptile::decay_objects ()
212{
213 if (!spaces)
214 return;
215
216 for (mapspace *ms = spaces + size (); ms-- > spaces; )
217 for (object *above, *op = ms->bot; op; op = above)
218 {
219 above = op->above;
220
221 bool destroy = 0;
222
223 // do not decay anything above unique floor tiles (yet :)
224 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
225 break;
226
227 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
228 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
229 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
230 || QUERY_FLAG (op, FLAG_UNIQUE)
231 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
232 || QUERY_FLAG (op, FLAG_UNPAID)
233 || op->is_alive ())
234 ; // do not decay
235 else if (op->is_weapon ())
236 {
237 op->stats.dam--;
238 if (op->stats.dam < 0)
239 destroy = 1;
240 }
241 else if (op->is_armor ())
242 {
243 op->stats.ac--;
244 if (op->stats.ac < 0)
245 destroy = 1;
246 }
247 else if (op->type == FOOD)
248 {
249 op->stats.food -= rndm (5, 20);
250 if (op->stats.food < 0)
251 destroy = 1;
252 }
253 else
254 {
255 int mat = op->materials;
256
257 if (mat & M_PAPER
258 || mat & M_LEATHER
259 || mat & M_WOOD
260 || mat & M_ORGANIC
261 || mat & M_CLOTH
262 || mat & M_LIQUID
263 || (mat & M_IRON && rndm (1, 5) == 1)
264 || (mat & M_GLASS && rndm (1, 2) == 1)
265 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
266 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
267 || (mat & M_ICE && temp > 32))
268 destroy = 1;
269 }
270
271 /* adjust overall chance below */
272 if (destroy && rndm (0, 1))
273 op->destroy ();
274 }
275}
276
277/* convert materialname to materialtype_t */ 208/* convert materialname to materialtype_t */
278 209
279materialtype_t * 210materialtype_t *
280name_to_material (const shstr &name) 211name_to_material (const shstr_cmp name)
281{ 212{
282 for (materialtype_t *mt = materialt; mt && mt->next; mt = mt->next) 213 for (materialtype_t *mt = materialt; mt; mt = mt->next)
283 if (name == mt->name) 214 if (name == mt->name)
284 return mt; 215 return mt;
285 216
286 return materialt; 217 return 0;
287} 218}
288 219
289/* when doing transmutation of objects, we have to recheck the resistances, 220/* when doing transmutation of objects, we have to recheck the resistances,
290 * as some that did not apply previously, may apply now. 221 * as some that did not apply previously, may apply now.
291 */ 222 */
292
293void 223void
294transmute_materialname (object *op, const object *change) 224transmute_materialname (object *op, const object *change)
295{ 225{
296 materialtype_t *mt; 226 materialtype_t *mt;
297 int j; 227 int j;
298 228
299 if (op->materialname == NULL) 229 if (!op->materialname)
300 return; 230 return;
301 231
302 if (change->materialname != NULL && strcmp (op->materialname, change->materialname)) 232 if (op->materialname != change->materialname)
303 return; 233 return;
304 234
305 if (!op->is_armor ()) 235 if (!op->is_armor ())
306 return; 236 return;
307 237
308 mt = name_to_material (op->materialname); 238 mt = name_to_material (op->materialname);
309 if (!mt) 239 if (!mt)
310 { 240 {
311 LOG (llevError, "archetype '%s>%s' uses nonexistent material '%s'\n", &op->arch->name, &op->name, &op->materialname); 241 LOG (llevError, "archetype '%s>%s' uses nonexistent material '%s'\n", &op->arch->archname, &op->name, &op->materialname);
312 return; 242 return;
313 } 243 }
314 244
315 for (j = 0; j < NROFATTACKS; j++) 245 for (j = 0; j < NROFATTACKS; j++)
316 if (op->resist[j] == 0 && change->resist[j] != 0) 246 if (op->resist[j] == 0 && change->resist[j] != 0)
… …
327void 257void
328set_materialname (object *op, int difficulty, materialtype_t *nmt) 258set_materialname (object *op, int difficulty, materialtype_t *nmt)
329{ 259{
330 materialtype_t *mt, *lmt; 260 materialtype_t *mt, *lmt;
331 261
332#ifdef NEW_MATERIAL_CODE
333 int j;
334#endif
335
336 if (op->materialname != NULL) 262 if (!op->materialname)
337 return; 263 return;
338 264
339 265 if (nmt)
340 266 lmt = nmt;
341 if (nmt == NULL) 267 else
342 { 268 {
343 lmt = NULL; 269 lmt = 0;
344#ifndef NEW_MATERIAL_CODE 270
345 for (mt = materialt; mt && mt->next; mt = mt->next) 271 for (mt = materialt; mt; mt = mt->next)
346 { 272 if (op->materials & mt->material && rndm (1, 100) <= mt->chance &&
347 if (op->materials & mt->material) 273 difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
348 { 274 {
349 lmt = mt; 275 lmt = mt;
276 if (!(op->is_weapon () || op->is_armor ()))
350 break; 277 break;
351 } 278 }
352 }
353
354#else
355 for (mt = materialt; mt && mt->next; mt = mt->next)
356 {
357 if (op->materials & mt->material && rndm (1, 100) <= mt->chance &&
358 difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
359 {
360 lmt = mt;
361 if (!(op->is_weapon () || op->is_armor ()))
362 break;
363 }
364 }
365#endif
366 }
367 else
368 { 279 }
369 lmt = nmt; 280
281 if (lmt)
370 } 282 {
371
372 if (lmt != NULL)
373 {
374#ifndef NEW_MATERIAL_CODE
375 op->materialname = lmt->name;
376 return;
377#else
378
379 if (op->stats.dam && op->is_weapon ()) 283 if (op->stats.dam && op->is_weapon ())
380 { 284 {
381 op->stats.dam += lmt->damage; 285 op->stats.dam += lmt->damage;
382 if (op->stats.dam < 1) 286 if (op->stats.dam < 1)
383 op->stats.dam = 1; 287 op->stats.dam = 1;
… …
389 op->stats.wc += lmt->wc; 293 op->stats.wc += lmt->wc;
390 if (op->is_armor ()) 294 if (op->is_armor ())
391 { 295 {
392 if (op->stats.ac) 296 if (op->stats.ac)
393 op->stats.ac += lmt->ac; 297 op->stats.ac += lmt->ac;
298
394 for (j = 0; j < NROFATTACKS; j++) 299 for (int j = 0; j < NROFATTACKS; j++)
395 if (op->resist[j] != 0) 300 if (op->resist[j] != 0)
396 { 301 {
397 op->resist[j] += lmt->mod[j]; 302 op->resist[j] += lmt->mod[j];
398 if (op->resist[j] > 100) 303 if (op->resist[j] > 100)
399 op->resist[j] = 100; 304 op->resist[j] = 100;
400 if (op->resist[j] < -100) 305 if (op->resist[j] < -100)
401 op->resist[j] = -100; 306 op->resist[j] = -100;
402 } 307 }
403 } 308 }
309
404 op->materialname = lmt->name; 310 op->materialname = lmt->name;
405 /* dont make it unstackable if it doesn't need to be */ 311 /* dont make it unstackable if it doesn't need to be */
406 if (op->is_weapon () || op->is_armor ()) 312 if (op->is_weapon () || op->is_armor ())
407 { 313 {
408 op->weight = (op->weight * lmt->weight) / 100; 314 op->weight = (op->weight * lmt->weight) / 100;
409 op->value = (op->value * lmt->value) / 100; 315 op->value = (op->value * lmt->value) / 100;
410 } 316 }
411#endif
412 } 317 }
413} 318}
414 319
415/* 320/*
416 * Strip out the media tags from a String. 321 * Strip out the media tags from a String.
… …
511 * a 'list' for the purposes here, is a string of items, seperated by commas, except 416 * a 'list' for the purposes here, is a string of items, seperated by commas, except
512 * for the last entry, which has an 'and' before it, and a full stop (period) after it. 417 * for the last entry, which has an 'and' before it, and a full stop (period) after it.
513 * This function will also strip all trailing non alphanumeric characters. 418 * This function will also strip all trailing non alphanumeric characters.
514 * It does not insert an oxford comma. 419 * It does not insert an oxford comma.
515 */ 420 */
516
517void 421void
518make_list_like (char *input) 422make_list_like (char *input)
519{ 423{
520 char *p, tmp[MAX_BUF]; 424 char *p, tmp[MAX_BUF];
521 int i; 425 int i;
… …
544 strcpy (input, tmp); 448 strcpy (input, tmp);
545 449
546 return; 450 return;
547} 451}
548 452
453/******************************************************************************/
454
455/* Checks a player-provided string which will become the msg property of
456 * an object for dangerous input.
457 */
458bool
459msg_is_safe (const char *msg)
460{
461 bool safe = true;
462
463 /* Trying to cheat by getting data into the object */
464 if (!strncmp (msg, "endmsg", sizeof ("endmsg") - 1)
465 || strstr (msg, "\nendmsg"))
466 safe = false;
467
468 /* Trying to make the object talk, and potentially access arbitrary code */
469 if (object::msg_has_dialogue (msg))
470 safe = false;
471
472 return safe;
473}
474
549///////////////////////////////////////////////////////////////////////////// 475/////////////////////////////////////////////////////////////////////////////
550 476
551void 477void
552fork_abort (const char *msg) 478fork_abort (const char *msg)
553{ 479{
554 if (!fork ()) 480 if (!fork ())
555 { 481 {
482 signal (SIGINT , SIG_IGN);
483 signal (SIGTERM, SIG_IGN);
556 signal (SIGABRT, SIG_DFL); 484 signal (SIGABRT, SIG_IGN);
485
486 signal (SIGSEGV, SIG_DFL);
487 signal (SIGBUS , SIG_DFL);
488 signal (SIGILL , SIG_DFL);
489 signal (SIGTRAP, SIG_DFL);
490
557 // try to put corefiles into a subdirectory, if existing, to allow 491 // try to put corefiles into a subdirectory, if existing, to allow
558 // an administrator to reduce the I/O load. 492 // an administrator to reduce the I/O load.
559 chdir ("cores"); 493 chdir ("cores");
494
495 // try to detach us from as many external dependencies as possible
496 // as coredumping can take time by closing all fd's.
497 {
498 struct rlimit lim;
499
500 if (getrlimit (RLIMIT_NOFILE, &lim))
501 lim.rlim_cur = 1024;
502
503 for (int i = 0; i < lim.rlim_cur; ++i)
504 close (i);
505 }
506
507 {
508 sigset_t empty;
509 sigemptyset (&empty);
510 sigprocmask (SIG_SETMASK, &empty, 0);
511 }
512
513 // try to coredump with SIGTRAP
514 kill (getpid (), SIGTRAP);
560 abort (); 515 abort ();
561 } 516 }
562 517
563 LOG (llevError, "fork abort: %s\n", msg); 518 LOG (llevError, "fork abort: %s\n", msg);
564} 519}
565 520
566void *salloc_ (int n) throw (std::bad_alloc) 521void *salloc_ (int n) throw (std::bad_alloc)
567{ 522{
568#ifdef PREFER_MALLOC
569 void *ptr = malloc (n);
570#else
571 void *ptr = g_slice_alloc (n); 523 void *ptr = g_slice_alloc (n);
572#endif
573 524
574 if (!ptr) 525 if (!ptr)
575 throw std::bad_alloc (); 526 throw std::bad_alloc ();
576 527
528 slice_alloc += n;
577 return ptr; 529 return ptr;
578} 530}
579 531
580void *salloc_ (int n, void *src) throw (std::bad_alloc) 532void *salloc_ (int n, void *src) throw (std::bad_alloc)
581{ 533{
… …
587 memset (ptr, 0, n); 539 memset (ptr, 0, n);
588 540
589 return ptr; 541 return ptr;
590} 542}
591 543
544/******************************************************************************/
545
546#if DEBUG_SALLOC
547
548#define MAGIC 0xa1b2c35543deadLL
549
550void *g_slice_alloc (unsigned long size)
551{
552 unsigned long *p = (unsigned long *) (g_slice_alloc)(size + sizeof (unsigned long));
553 *p++ = size ^ MAGIC;
554 //fprintf (stderr, "g_slice_alloc %ld %p\n", size, p);//D
555 return (void *)p;
556}
557
558void *g_slice_alloc0 (unsigned long size)
559{
560 return memset (g_slice_alloc (size), 0, size);
561}
562
563void g_slice_free1 (unsigned long size, void *ptr)
564{
565 //fprintf (stderr, "g_slice_free %ld %p\n", size, ptr);//D
566 if (expect_true (ptr))
567 {
568 unsigned long *p = (unsigned long *)ptr;
569 unsigned long s = *--p ^ MAGIC;
570
571 if (size != (unsigned long)(*p ^ MAGIC))
572 {
573 LOG (logBacktrace | llevError, "slice free size (%lx) doesn't match alloc size (%lx)\n", size, s);
574 abort ();
575 }
576
577 *p = MAGIC;
578
579 (g_slice_free1)(s + sizeof (unsigned long), p);
580 }
581}
582
583#endif
584
585/******************************************************************************/
586
587int
592void assign (char *dst, const char *src, int maxlen) 588assign (char *dst, const char *src, int maxsize)
593{ 589{
594 if (!src) 590 if (!src)
595 src = ""; 591 src = "";
596 592
597 int len = strlen (src); 593 int len = strlen (src);
598 594
599 if (len >= maxlen - 1) 595 if (len >= maxsize)
600 { 596 {
601 if (maxlen <= 4) 597 if (maxsize <= 4)
602 { 598 {
603 memset (dst, '.', maxlen - 1); 599 memset (dst, '.', maxsize - 2);
604 dst [maxlen - 1] = 0; 600 dst [maxsize - 1] = 0;
605 } 601 }
606 else 602 else
607 { 603 {
608 memcpy (dst, src, maxlen - 4); 604 memcpy (dst, src, maxsize - 4);
609 memcpy (dst + maxlen - 4, "...", 4); 605 memcpy (dst + maxsize - 4, "...", 4);
610 } 606 }
607
608 len = maxsize;
611 } 609 }
612 else 610 else
613 memcpy (dst, src, len + 1); 611 memcpy (dst, src, ++len);
614}
615 612
616const std::string 613 return len;
614}
615
616const char *
617format (const char *format, ...) 617format (const char *format, ...)
618{ 618{
619 int len; 619 static dynbuf_text buf;
620 620
621 { 621 buf.clear ();
622 char buf[128];
623 622
624 va_list ap; 623 va_list ap;
625 va_start (ap, format); 624 va_start (ap, format);
626 len = vsnprintf (buf, sizeof (buf), format, ap); 625 buf.vprintf (format, ap);
627 va_end (ap); 626 va_end (ap);
628 627
629 assert (len >= 0); // shield againstz broken vsnprintf's
630
631 // was our static buffer short enough?
632 if (len < sizeof (buf))
633 return std::string (buf, len);
634 }
635
636 {
637 // longer, try harder
638 char *buf = salloc<char> (len + 1);
639
640 va_list ap;
641 va_start (ap, format);
642 vsnprintf (buf, len + 1, format, ap);
643 va_end (ap);
644
645 const std::string s (buf, len);
646 sfree<char> (buf, len + 1);
647
648 return buf; 628 return buf;
649 }
650} 629}
651 630
652tstamp now () 631tstamp now ()
653{ 632{
654 struct timeval tv; 633 struct timeval tv;
… …
722 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL, 701 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
723 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL, 702 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
724 0x2d02ef8dL 703 0x2d02ef8dL
725}; 704};
726 705
706void thread::start (void *(*start_routine)(void *), void *arg)
707{
708 pthread_attr_t attr;
727 709
710 pthread_attr_init (&attr);
711 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
712 pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN < sizeof (long) * 4096
713 ? sizeof (long) * 4096 : PTHREAD_STACK_MIN);
714#ifdef PTHREAD_SCOPE_PROCESS
715 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
716#endif
717
718 sigset_t fullsigset, oldsigset;
719 sigfillset (&fullsigset);
720
721 pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
722
723 if (pthread_create (&id, &attr, start_routine, arg))
724 cleanup ("unable to create a new thread");
725
726 pthread_sigmask (SIG_SETMASK, &oldsigset, 0);
727}
728

Diff Legend

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