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.87 by sf-marcmagus, Sun Oct 11 01:35:53 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
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 < 1 || 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, diff, luck, ran; 131 sint64 omin = r_min;
127 int base; 132 sint64 range = max (0, r_max - r_min + 1);
128 133 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 | logBacktrace, "Calling random_roll64 with min=%" PRId64 " max=%" PRId64 "\n", min, max);
136 return (min); /* avoids a float exception */
137 }
138 134
139 /* 135 /*
140 * 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
141 * a little bitshifting. 137 * a little bitshifting.
142 */ 138 */
143 ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31); 139 sint64 ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31);
144 140
145 if (op->type != PLAYER) 141 if (op->type != PLAYER)
146 return ((ran % diff) + min); 142 return ((ran % range) + r_min);
147 143
148 luck = op->stats.luck; 144 int luck = op->stats.luck;
145
149 if (rndm (base) < MIN (10, abs (luck))) 146 if (rndm (base) < min (10, abs (luck)))
150 { 147 {
151 /* we have a winner */ 148 /* we have a winner */
152 ((luck > 0) ? (luck = 1) : (luck = -1)); 149 ((luck > 0) ? (luck = 1) : (luck = -1));
153 diff -= luck; 150 range -= luck;
154 if (diff < 1) 151 if (range < 1)
155 return (omin); /*check again */ 152 return (omin); /*check again */
153
156 ((goodbad) ? (min += luck) : (diff)); 154 ((goodbad) ? (r_min += luck) : (range));
157 155
158 return (MAX (omin, MIN (max, (ran % diff) + min))); 156 return (max (omin, min (r_max, (ran % range) + r_min)));
159 } 157 }
160 158
161 return ((ran % diff) + min); 159 return ran % range + r_min;
162} 160}
163 161
164/* 162/*
165 * 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,
166 * 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.
167 * Generally, op should be the player/caster/hitter requesting the roll, 165 * Generally, op should be the player/caster/hitter requesting the roll,
168 * not the recipient (ie, the poor slob getting hit). 166 * not the recipient (ie, the poor slob getting hit).
169 * The args are num D size (ie 4d6) [garbled 20010916] 167 * The args are num D size (ie 4d6) [garbled 20010916]
170 */ 168 */
171
172int 169int
173die_roll (int num, int size, const object *op, int goodbad) 170die_roll (int num, int size, const object *op, int goodbad)
174{ 171{
175 int min, diff, luck, total, i, gotlucky, base; 172 int min, luck, total, i, gotlucky;
176 173
177 diff = size; 174 int diff = size;
178 min = 1; 175 min = 1;
179 luck = total = gotlucky = 0; 176 luck = total = gotlucky = 0;
180 ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */ 177 int base = diff > 2 ? 20 : 50; /* d2 and d3 are corner cases */
178
181 if (size < 2 || diff < 1) 179 if (size < 2 || diff < 1)
182 { 180 {
183 LOG (llevError, "Calling die_roll with num=%d size=%d\n", num, size); 181 LOG (llevError, "Calling die_roll with num=%d size=%d\n", num, size);
184 return (num); /* avoids a float exception */ 182 return num; /* avoids a float exception */
185 } 183 }
186 184
187 if (op->type == PLAYER) 185 if (op->type == PLAYER)
188 luck = op->stats.luck; 186 luck = op->stats.luck;
189 187
… …
205 } 203 }
206 204
207 return total; 205 return total;
208} 206}
209 207
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 */ 208/* convert materialname to materialtype_t */
279 209
280materialtype_t * 210materialtype_t *
281name_to_material (const shstr &name) 211name_to_material (const shstr_cmp name)
282{ 212{
283 for (materialtype_t *mt = materialt; mt && mt->next; mt = mt->next) 213 for (materialtype_t *mt = materialt; mt; mt = mt->next)
284 if (name == mt->name) 214 if (name == mt->name)
285 return mt; 215 return mt;
286 216
287 return materialt; 217 return 0;
288} 218}
289 219
290/* when doing transmutation of objects, we have to recheck the resistances, 220/* when doing transmutation of objects, we have to recheck the resistances,
291 * as some that did not apply previously, may apply now. 221 * as some that did not apply previously, may apply now.
292 */ 222 */
293
294void 223void
295transmute_materialname (object *op, const object *change) 224transmute_materialname (object *op, const object *change)
296{ 225{
297 materialtype_t *mt; 226 materialtype_t *mt;
298 int j; 227 int j;
299 228
300 if (op->materialname == NULL) 229 if (!op->materialname)
301 return; 230 return;
302 231
303 if (change->materialname != NULL && strcmp (op->materialname, change->materialname)) 232 if (op->materialname != change->materialname)
304 return; 233 return;
305 234
306 if (!op->is_armor ()) 235 if (!op->is_armor ())
307 return; 236 return;
308 237
309 mt = name_to_material (op->materialname); 238 mt = name_to_material (op->materialname);
310 if (!mt) 239 if (!mt)
311 { 240 {
312 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);
313 return; 242 return;
314 } 243 }
315 244
316 for (j = 0; j < NROFATTACKS; j++) 245 for (j = 0; j < NROFATTACKS; j++)
317 if (op->resist[j] == 0 && change->resist[j] != 0) 246 if (op->resist[j] == 0 && change->resist[j] != 0)
… …
328void 257void
329set_materialname (object *op, int difficulty, materialtype_t *nmt) 258set_materialname (object *op, int difficulty, materialtype_t *nmt)
330{ 259{
331 materialtype_t *mt, *lmt; 260 materialtype_t *mt, *lmt;
332 261
333#ifdef NEW_MATERIAL_CODE
334 int j;
335#endif
336
337 if (op->materialname != NULL) 262 if (!op->materialname)
338 return; 263 return;
339 264
340 265 if (nmt)
341 266 lmt = nmt;
342 if (nmt == NULL) 267 else
343 { 268 {
344 lmt = NULL; 269 lmt = 0;
345#ifndef NEW_MATERIAL_CODE 270
346 for (mt = materialt; mt && mt->next; mt = mt->next) 271 for (mt = materialt; mt; mt = mt->next)
347 { 272 if (op->materials & mt->material && rndm (1, 100) <= mt->chance &&
348 if (op->materials & mt->material) 273 difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
349 { 274 {
350 lmt = mt; 275 lmt = mt;
276 if (!(op->is_weapon () || op->is_armor ()))
351 break; 277 break;
352 } 278 }
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 { 279 }
370 lmt = nmt; 280
281 if (lmt)
371 } 282 {
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 ()) 283 if (op->stats.dam && op->is_weapon ())
381 { 284 {
382 op->stats.dam += lmt->damage; 285 op->stats.dam += lmt->damage;
383 if (op->stats.dam < 1) 286 if (op->stats.dam < 1)
384 op->stats.dam = 1; 287 op->stats.dam = 1;
… …
390 op->stats.wc += lmt->wc; 293 op->stats.wc += lmt->wc;
391 if (op->is_armor ()) 294 if (op->is_armor ())
392 { 295 {
393 if (op->stats.ac) 296 if (op->stats.ac)
394 op->stats.ac += lmt->ac; 297 op->stats.ac += lmt->ac;
298
395 for (j = 0; j < NROFATTACKS; j++) 299 for (int j = 0; j < NROFATTACKS; j++)
396 if (op->resist[j] != 0) 300 if (op->resist[j] != 0)
397 { 301 {
398 op->resist[j] += lmt->mod[j]; 302 op->resist[j] += lmt->mod[j];
399 if (op->resist[j] > 100) 303 if (op->resist[j] > 100)
400 op->resist[j] = 100; 304 op->resist[j] = 100;
401 if (op->resist[j] < -100) 305 if (op->resist[j] < -100)
402 op->resist[j] = -100; 306 op->resist[j] = -100;
403 } 307 }
404 } 308 }
309
405 op->materialname = lmt->name; 310 op->materialname = lmt->name;
406 /* dont make it unstackable if it doesn't need to be */ 311 /* dont make it unstackable if it doesn't need to be */
407 if (op->is_weapon () || op->is_armor ()) 312 if (op->is_weapon () || op->is_armor ())
408 { 313 {
409 op->weight = (op->weight * lmt->weight) / 100; 314 op->weight = (op->weight * lmt->weight) / 100;
410 op->value = (op->value * lmt->value) / 100; 315 op->value = (op->value * lmt->value) / 100;
411 } 316 }
412#endif
413 } 317 }
414} 318}
415 319
416/* 320/*
417 * Strip out the media tags from a String. 321 * Strip out the media tags from a String.
… …
512 * 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
513 * 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.
514 * This function will also strip all trailing non alphanumeric characters. 418 * This function will also strip all trailing non alphanumeric characters.
515 * It does not insert an oxford comma. 419 * It does not insert an oxford comma.
516 */ 420 */
517
518void 421void
519make_list_like (char *input) 422make_list_like (char *input)
520{ 423{
521 char *p, tmp[MAX_BUF]; 424 char *p, tmp[MAX_BUF];
522 int i; 425 int i;
… …
545 strcpy (input, tmp); 448 strcpy (input, tmp);
546 449
547 return; 450 return;
548} 451}
549 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", strlen ("endmsg")) || strstr (msg, "\nendmsg"))
465 safe = false;
466
467 /* Trying to make the object talk, and potentially access arbitrary code */
468 if (object::msg_has_dialogue (msg))
469 safe = false;
470
471 return safe;
472}
473
550///////////////////////////////////////////////////////////////////////////// 474/////////////////////////////////////////////////////////////////////////////
551 475
552void 476void
553fork_abort (const char *msg) 477fork_abort (const char *msg)
554{ 478{
555 if (!fork ()) 479 if (!fork ())
556 { 480 {
481 signal (SIGINT , SIG_IGN);
482 signal (SIGTERM, SIG_IGN);
557 signal (SIGABRT, SIG_DFL); 483 signal (SIGABRT, SIG_IGN);
484
485 signal (SIGSEGV, SIG_DFL);
486 signal (SIGBUS , SIG_DFL);
487 signal (SIGILL , SIG_DFL);
488 signal (SIGTRAP, SIG_DFL);
489
558 // try to put corefiles into a subdirectory, if existing, to allow 490 // try to put corefiles into a subdirectory, if existing, to allow
559 // an administrator to reduce the I/O load. 491 // an administrator to reduce the I/O load.
560 chdir ("cores"); 492 chdir ("cores");
493
494 // try to detach us from as many external dependencies as possible
495 // as coredumping can take time by closing all fd's.
496 {
497 struct rlimit lim;
498
499 if (getrlimit (RLIMIT_NOFILE, &lim))
500 lim.rlim_cur = 1024;
501
502 for (int i = 0; i < lim.rlim_cur; ++i)
503 close (i);
504 }
505
506 {
507 sigset_t empty;
508 sigemptyset (&empty);
509 sigprocmask (SIG_SETMASK, &empty, 0);
510 }
511
512 // try to coredump with SIGTRAP
513 kill (getpid (), SIGTRAP);
561 abort (); 514 abort ();
562 } 515 }
563 516
564 LOG (llevError, "fork abort: %s\n", msg); 517 LOG (llevError, "fork abort: %s\n", msg);
565} 518}
566 519
567void *salloc_ (int n) throw (std::bad_alloc) 520void *salloc_ (int n) throw (std::bad_alloc)
568{ 521{
569#ifdef PREFER_MALLOC
570 void *ptr = malloc (n);
571#else
572 void *ptr = g_slice_alloc (n); 522 void *ptr = g_slice_alloc (n);
573#endif
574 523
575 if (!ptr) 524 if (!ptr)
576 throw std::bad_alloc (); 525 throw std::bad_alloc ();
577 526
527 slice_alloc += n;
578 return ptr; 528 return ptr;
579} 529}
580 530
581void *salloc_ (int n, void *src) throw (std::bad_alloc) 531void *salloc_ (int n, void *src) throw (std::bad_alloc)
582{ 532{
… …
588 memset (ptr, 0, n); 538 memset (ptr, 0, n);
589 539
590 return ptr; 540 return ptr;
591} 541}
592 542
543/******************************************************************************/
544
545#if DEBUG_SALLOC
546
547#define MAGIC 0xa1b2c35543deadLL
548
549void *g_slice_alloc (unsigned long size)
550{
551 unsigned long *p = (unsigned long *) (g_slice_alloc)(size + sizeof (unsigned long));
552 *p++ = size ^ MAGIC;
553 //fprintf (stderr, "g_slice_alloc %ld %p\n", size, p);//D
554 return (void *)p;
555}
556
557void *g_slice_alloc0 (unsigned long size)
558{
559 return memset (g_slice_alloc (size), 0, size);
560}
561
562void g_slice_free1 (unsigned long size, void *ptr)
563{
564 //fprintf (stderr, "g_slice_free %ld %p\n", size, ptr);//D
565 if (expect_true (ptr))
566 {
567 unsigned long *p = (unsigned long *)ptr;
568 unsigned long s = *--p ^ MAGIC;
569
570 if (size != (unsigned long)(*p ^ MAGIC))
571 {
572 LOG (logBacktrace | llevError, "slice free size (%lx) doesn't match alloc size (%lx)\n", size, s);
573 abort ();
574 }
575
576 *p = MAGIC;
577
578 (g_slice_free1)(s + sizeof (unsigned long), p);
579 }
580}
581
582#endif
583
584/******************************************************************************/
585
586int
593void assign (char *dst, const char *src, int maxlen) 587assign (char *dst, const char *src, int maxsize)
594{ 588{
595 if (!src) 589 if (!src)
596 src = ""; 590 src = "";
597 591
598 int len = strlen (src); 592 int len = strlen (src);
599 593
600 if (len >= maxlen - 1) 594 if (len >= maxsize)
601 { 595 {
602 if (maxlen <= 4) 596 if (maxsize <= 4)
603 { 597 {
604 memset (dst, '.', maxlen - 1); 598 memset (dst, '.', maxsize - 2);
605 dst [maxlen - 1] = 0; 599 dst [maxsize - 1] = 0;
606 } 600 }
607 else 601 else
608 { 602 {
609 memcpy (dst, src, maxlen - 4); 603 memcpy (dst, src, maxsize - 4);
610 memcpy (dst + maxlen - 4, "...", 4); 604 memcpy (dst + maxsize - 4, "...", 4);
611 } 605 }
606
607 len = maxsize;
612 } 608 }
613 else 609 else
614 memcpy (dst, src, len + 1); 610 memcpy (dst, src, ++len);
615}
616 611
617const std::string 612 return len;
613}
614
615const char *
618format (const char *format, ...) 616format (const char *format, ...)
619{ 617{
620 int len; 618 static dynbuf_text buf;
621 619
622 { 620 buf.clear ();
623 char buf[128];
624 621
625 va_list ap; 622 va_list ap;
626 va_start (ap, format); 623 va_start (ap, format);
627 len = vsnprintf (buf, sizeof (buf), format, ap); 624 buf.vprintf (format, ap);
628 va_end (ap); 625 va_end (ap);
629 626
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; 627 return buf;
650 }
651} 628}
652 629
653tstamp now () 630tstamp now ()
654{ 631{
655 struct timeval tv; 632 struct timeval tv;
… …
723 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL, 700 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
724 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL, 701 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
725 0x2d02ef8dL 702 0x2d02ef8dL
726}; 703};
727 704
705void thread::start (void *(*start_routine)(void *), void *arg)
706{
707 pthread_attr_t attr;
728 708
709 pthread_attr_init (&attr);
710 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
711 pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN < sizeof (long) * 4096
712 ? sizeof (long) * 4096 : PTHREAD_STACK_MIN);
713#ifdef PTHREAD_SCOPE_PROCESS
714 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
715#endif
716
717 sigset_t fullsigset, oldsigset;
718 sigfillset (&fullsigset);
719
720 pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
721
722 if (pthread_create (&id, &attr, start_routine, arg))
723 cleanup ("unable to create a new thread");
724
725 pthread_sigmask (SIG_SETMASK, &oldsigset, 0);
726}
727

Diff Legend

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