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.64 by root, Fri Aug 10 11:02:44 2007 UTC vs.
Revision 1.109 by root, Wed Dec 5 19:03:26 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines