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

Diff Legend

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