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

Diff Legend

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