[ViewVC] Diff of: cvs/deliantra/server/common/utils.C

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.77 by root, Sun May 4 14:12:37 2008 UTC vs.
Revision 1.109 by root, Wed Dec 5 19:03:26 2018 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
		4	* Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	5	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	6	*
8	* Deliantra 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 <support@deliantra.net>	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>
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 <material.h>	36	#include <material.h>
		37	#include <object.h>
		38
		39	#include <sys/time.h>
		40	#include <sys/resource.h>
37		41
38	#include <glib.h>	42	#include <glib.h>
39		43
40	refcnt_base::refcnt_t refcnt_dummy;	44	refcnt_base::refcnt_t refcnt_dummy;
41	ssize_t slice_alloc;	45	ssize_t slice_alloc;
42	rand_gen rndm, rmg_rndm;
43		46
44	void	47	/******************************************************************************/
45	tausworthe_random_generator::seed (uint32_t seed)
46	{
47	state [0] = seed * 69069U; if (state [0] < 2U) state [0] += 2U;
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] < 128U) state [0] += 128U;
51		48
52	for (int i = 11; --i; )	49	/* Checks a player-provided string which will become the msg property of
53	operator ()();	50	* an object for dangerous input.
54	}
55
56	uint32_t
57	tausworthe_random_generator::next ()
58	{
59	state [0] = ((state [0] & 0xFFFFFFFEU) << 18U) ^ (((state [0] << 6U) ^ state [0]) >> 13U);
60	state [1] = ((state [1] & 0xFFFFFFF8U) << 2U) ^ (((state [1] << 2U) ^ state [1]) >> 27U);
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
64	return state [0] ^ state [1] ^ state [2] ^ state [3];
65	}
66
67	uint32_t
68	tausworthe_random_generator::get_range (uint32_t num)
69	{
70	return (next () * (uint64_t)num) >> 32U;
71	}
72
73	// return a number within (min .. max)
74	int
75	tausworthe_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	*/	51	*/
88		52	bool
89	/*	53	msg_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	*/
95	int
96	random_roll (int r_min, int r_max, const object *op, int goodbad)
97	{	54	{
98	int base = r_max - r_min > 1 ? 20 : 50; /* d2 and d3 are corner cases */	55	bool safe = true;
99		56
100	if (r_max < r_min)	57	/* Trying to cheat by getting data into the object */
101	{	58	if (!strncmp (msg, "endmsg", sizeof ("endmsg") - 1)
102	LOG (llevError \| logBacktrace, "Calling random_roll with min=%d max=%d\n", r_min, r_max);	59	\|\| strstr (msg, "\nendmsg"))
103	return r_min;	60	safe = false;
104	}
105		61
106	if (op->type == PLAYER)	62	/* Trying to make the object talk, and potentially access arbitrary code */
107	{	63	if (object::msg_has_dialogue (msg))
108	int luck = op->stats.luck;	64	safe = false;
109		65
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	*/
123	sint64
124	random_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	*/
170	int
171	die_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	/* convert materialname to materialtype_t */
210
211	materialtype_t *
212	name_to_material (const shstr &name)
213	{
214	for (materialtype_t *mt = materialt; mt && mt->next; mt = mt->next)
215	if (name == mt->name)
216	return mt;
217
218	return 0;	66	return safe;
219	}
220
221	/* when doing transmutation of objects, we have to recheck the resistances,
222	* as some that did not apply previously, may apply now.
223	*/
224	void
225	transmute_materialname (object op, const object change)
226	{
227	materialtype_t *mt;
228	int j;
229
230	if (op->materialname == NULL)
231	return;
232
233	if (change->materialname != NULL && strcmp (op->materialname, change->materialname))
234	return;
235
236	if (!op->is_armor ())
237	return;
238
239	mt = name_to_material (op->materialname);
240	if (!mt)
241	{
242	LOG (llevError, "archetype '%s>%s' uses nonexistent material '%s'\n", &op->arch->archname, &op->name, &op->materialname);
243	return;
244	}
245
246	for (j = 0; j < NROFATTACKS; j++)
247	if (op->resist[j] == 0 && change->resist[j] != 0)
248	{
249	op->resist[j] += mt->mod[j];
250	if (op->resist[j] > 100)
251	op->resist[j] = 100;
252	if (op->resist[j] < -100)
253	op->resist[j] = -100;
254	}
255	}
256
257	/* set the materialname and type for an item */
258	void
259	set_materialname (object op, int difficulty, materialtype_t nmt)
260	{
261	materialtype_t mt, lmt;
262
263	if (op->materialname != NULL)
264	return;
265
266	if (nmt == NULL)
267	{
268	lmt = NULL;
269
270	for (mt = materialt; mt && mt->next; mt = mt->next)
271	if (op->materials & mt->material && rndm (1, 100) <= mt->chance &&
272	difficulty >= mt->difficulty && (op->magic >= mt->magic \|\| mt->magic == 0))
273	{
274	lmt = mt;
275	if (!(op->is_weapon () \|\| op->is_armor ()))
276	break;
277	}
278	}
279	else
280	lmt = nmt;
281
282	if (lmt != NULL)
283	{
284	if (op->stats.dam && op->is_weapon ())
285	{
286	op->stats.dam += lmt->damage;
287	if (op->stats.dam < 1)
288	op->stats.dam = 1;
289	}
290
291	if (op->stats.sp && op->type == BOW)
292	op->stats.sp += lmt->sp;
293	if (op->stats.wc && op->is_weapon ())
294	op->stats.wc += lmt->wc;
295	if (op->is_armor ())
296	{
297	if (op->stats.ac)
298	op->stats.ac += lmt->ac;
299
300	for (int j = 0; j < NROFATTACKS; j++)
301	if (op->resist[j] != 0)
302	{
303	op->resist[j] += lmt->mod[j];
304	if (op->resist[j] > 100)
305	op->resist[j] = 100;
306	if (op->resist[j] < -100)
307	op->resist[j] = -100;
308	}
309	}
310
311	op->materialname = lmt->name;
312	/* dont make it unstackable if it doesn't need to be */
313	if (op->is_weapon () \|\| op->is_armor ())
314	{
315	op->weight = (op->weight * lmt->weight) / 100;
316	op->value = (op->value * lmt->value) / 100;
317	}
318	}
319	}
320
321	/*
322	* Strip out the media tags from a String.
323	* Warning the input string will contain the result string
324	*/
325	void
326	strip_media_tag (char *message)
327	{
328	int in_tag = 0;
329	char *dest;
330	char *src;
331
332	src = dest = message;
333	while (*src != '\0')
334	{
335	if (*src == '[')
336	{
337	in_tag = 1;
338	}
339	else if (in_tag && (*src == ']'))
340	in_tag = 0;
341	else if (!in_tag)
342	{
343	dest = src;
344	dest++;
345	}
346	src++;
347	}
348	*dest = '\0';
349	}
350
351	const char *
352	strrstr (const char haystack, const char needle)
353	{
354	const char *lastneedle;
355
356	lastneedle = NULL;
357	while ((haystack = strstr (haystack, needle)) != NULL)
358	{
359	lastneedle = haystack;
360	haystack++;
361	}
362	return lastneedle;
363
364	}
365
366	#define EOL_SIZE (sizeof("\n")-1)
367	void
368	strip_endline (char *buf)
369	{
370	if (strlen (buf) < sizeof ("\n"))
371	{
372	return;
373	}
374	if (!strcmp (buf + strlen (buf) - EOL_SIZE, "\n"))
375	buf[strlen (buf) - EOL_SIZE] = '\0';
376	}
377
378	/**
379	* Replace in string src all occurrences of key by replacement. The resulting
380	* string is put into result; at most resultsize characters (including the
381	* terminating null character) will be written to result.
382	*/
383	void
384	replace (const char src, const char key, const char replacement, char result, size_t resultsize)
385	{
386	size_t resultlen;
387	size_t keylen;
388
389	/* special case to prevent infinite loop if key==replacement=="" */
390	if (strcmp (key, replacement) == 0)
391	{
392	snprintf (result, resultsize, "%s", src);
393	return;
394	}
395
396	keylen = strlen (key);
397
398	resultlen = 0;
399	while (*src != '\0' && resultlen + 1 < resultsize)
400	{
401	if (strncmp (src, key, keylen) == 0)
402	{
403	snprintf (result + resultlen, resultsize - resultlen, "%s", replacement);
404	resultlen += strlen (result + resultlen);
405	src += keylen;
406	}
407	else
408	{
409	result[resultlen++] = *src++;
410	}
411	}
412	result[resultlen] = '\0';
413	}
414
415	/**
416	* Taking a string as an argument, mutate it into a string that looks like a list.
417	* a 'list' for the purposes here, is a string of items, seperated by commas, except
418	* for the last entry, which has an 'and' before it, and a full stop (period) after it.
419	* This function will also strip all trailing non alphanumeric characters.
420	* It does not insert an oxford comma.
421	*/
422	void
423	make_list_like (char *input)
424	{
425	char *p, tmp[MAX_BUF];
426	int i;
427
428	if (!input \|\| strlen (input) > MAX_BUF - 5)
429	return;
430	/* bad stuff would happen if we continued here, the -5 is to make space for ' and ' */
431
432	strncpy (tmp, input, MAX_BUF - 5);
433	/trim all trailing commas, spaces etc. /
434	for (i = strlen (tmp); !isalnum (tmp[i]) && i >= 0; i--)
435	tmp[i] = '\0';
436
437	strcat (tmp, ".");
438
439	p = strrchr (tmp, ',');
440	if (p)
441	{
442	*p = '\0';
443	strcpy (input, tmp);
444	p++;
445	strcat (input, " and");
446	strcat (input, p);
447	}
448	else
449	strcpy (input, tmp);
450
451	return;
452	}	67	}
453		68
454	/////////////////////////////////////////////////////////////////////////////	69	/////////////////////////////////////////////////////////////////////////////
455		70
456	void	71	void
457	fork_abort (const char *msg)	72	fork_abort (const char *msg)
458	{	73	{
459	if (!fork ())	74	if (!fork ())
460	{	75	{
		76	signal (SIGINT , SIG_IGN);
		77	signal (SIGTERM, SIG_IGN);
461	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
462	// try to put corefiles into a subdirectory, if existing, to allow	88	// try to put corefiles into a subdirectory, if existing, to allow
463	// an administrator to reduce the I/O load.	89	// an administrator to reduce the I/O load.
464	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);
465	abort ();	112	abort ();
466	}	113	}
467		114
468	LOG (llevError, "fork abort: %s\n", msg);	115	LOG (llevError, "fork abort: %s\n", msg);
469	}	116	}
470		117
471	void *salloc_ (int n) throw (std::bad_alloc)	118	void *
		119	salloc_ (int n)
472	{	120	{
473	void *ptr = g_slice_alloc (n);	121	void *ptr = g_slice_alloc (n);
474		122
475	if (!ptr)	123	if (!ptr)
476	throw std::bad_alloc ();	124	throw std::bad_alloc ();
477		125
478	slice_alloc += n;	126	slice_alloc += n;
479	return ptr;	127	return ptr;
480	}	128	}
481		129
482	void salloc_ (int n, void src) throw (std::bad_alloc)	130	void *
		131	salloc_ (int n, void *src)
483	{	132	{
484	void *ptr = salloc_ (n);	133	void *ptr = salloc_ (n);
485		134
486	if (src)	135	if (src)
487	memcpy (ptr, src, n);	136	memcpy (ptr, src, n);
…		…
495		144
496	#if DEBUG_SALLOC	145	#if DEBUG_SALLOC
497		146
498	#define MAGIC 0xa1b2c35543deadLL	147	#define MAGIC 0xa1b2c35543deadLL
499		148
		149	void *
500	void *g_slice_alloc (unsigned long size)	150	g_slice_alloc (unsigned long size)
501	{	151	{
502	unsigned long p = (unsigned long ) (g_slice_alloc)(size + sizeof (unsigned long));	152	unsigned long p = (unsigned long ) (g_slice_alloc)(size + sizeof (unsigned long));
503	*p++ = size ^ MAGIC;	153	*p++ = size ^ MAGIC;
504	//fprintf (stderr, "g_slice_alloc %ld %p\n", size, p);//D	154	//fprintf (stderr, "g_slice_alloc %ld %p\n", size, p);//D
505	return (void *)p;	155	return (void *)p;
506	}	156	}
507		157
		158	void *
508	void *g_slice_alloc0 (unsigned long size)	159	g_slice_alloc0 (unsigned long size)
509	{	160	{
510	return memset (g_slice_alloc (size), 0, size);	161	return memset (g_slice_alloc (size), 0, size);
511	}	162	}
512		163
		164	void
513	void g_slice_free1 (unsigned long size, void *ptr)	165	g_slice_free1 (unsigned long size, void *ptr)
514	{	166	{
515	//fprintf (stderr, "g_slice_free %ld %p\n", size, ptr);//D	167	//fprintf (stderr, "g_slice_free %ld %p\n", size, ptr);//D
516	if (expect_true (ptr))	168	if (ecb_expect_true (ptr))
517	{	169	{
518	unsigned long p = (unsigned long )ptr;	170	unsigned long p = (unsigned long )ptr;
519	unsigned long s = *--p ^ MAGIC;	171	unsigned long s = *--p ^ MAGIC;
520		172
521	if (size != (unsigned long)(*p ^ MAGIC))	173	if (size != (unsigned long)(*p ^ MAGIC))
…		…
532		184
533	#endif	185	#endif
534		186
535	/******************************************************************************/	187	/******************************************************************************/
536		188
		189	refcnt_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
		197	refcnt_buf::refcnt_buf (void *data, size_t size)
		198	{
		199	_alloc (size);
		200	memcpy (this->data, data, size);
		201	}
		202
		203	refcnt_buf::~refcnt_buf ()
		204	{
		205	dec ();
		206	}
		207
		208	void
		209	refcnt_buf::_dealloc ()
		210	{
		211	sfree<char> (data - overhead, size () + overhead);
		212	}
		213
		214	refcnt_buf &
		215	refcnt_buf::operator =(const refcnt_buf &src)
		216	{
		217	dec ();
		218	data = src.data;
		219	inc ();
		220	return *this;
		221	}
		222
		223	/******************************************************************************/
		224
		225	int
537	void assign (char dst, const char src, int maxlen)	226	assign (char dst, const char src, int maxsize)
538	{	227	{
539	if (!src)	228	if (!src)
540	src = "";	229	src = "";
541		230
542	int len = strlen (src);	231	int len = strlen (src);
543		232
544	if (len >= maxlen - 1)	233	if (len >= maxsize)
545	{	234	{
546	if (maxlen <= 4)	235	if (maxsize <= 4)
547	{	236	{
548	memset (dst, '.', maxlen - 1);	237	memset (dst, '.', maxsize - 2);
549	dst [maxlen - 1] = 0;	238	dst [maxsize - 1] = 0;
550	}	239	}
551	else	240	else
552	{	241	{
553	memcpy (dst, src, maxlen - 4);	242	memcpy (dst, src, maxsize - 4);
554	memcpy (dst + maxlen - 4, "...", 4);	243	memcpy (dst + maxsize - 4, "...", 4);
555	}	244	}
		245
		246	len = maxsize;
556	}	247	}
557	else	248	else
558	memcpy (dst, src, len + 1);	249	memcpy (dst, src, ++len);
559	}
560		250
561	const char *	251	return len;
		252	}
		253
		254	char *
		255	vformat (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
		267	char *
562	format (const char *format, ...)	268	format (const char *format, ...)
563	{	269	{
564	static dynbuf_text buf;
565
566	buf.clear ();
567
568	va_list ap;	270	va_list ap;
569	va_start (ap, format);	271	va_start (ap, format);
570	buf.vprintf (format, ap);	272	char *buf = vformat (format, ap);
571	va_end (ap);	273	va_end (ap);
572		274
573	return buf;	275	return buf;
574	}	276	}
575		277
576	tstamp now ()	278	tstamp
		279	now ()
577	{	280	{
578	struct timeval tv;	281	struct timeval tv;
579		282
580	gettimeofday (&tv, 0);	283	gettimeofday (&tv, 0);
581	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);
…		…
646	0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,	349	0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
647	0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,	350	0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
648	0x2d02ef8dL	351	0x2d02ef8dL
649	};	352	};
650		353
		354	void
651	void thread::start (void (start_routine)(void ), void arg)	355	thread::start (void (start_routine)(void ), void arg)
652	{	356	{
653	pthread_attr_t attr;	357	pthread_attr_t attr;
654		358
655	pthread_attr_init (&attr);	359	pthread_attr_init (&attr);
656	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);	360	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);

Diff Legend

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

Comparing deliantra/server/common/utils.C (file contents): Revision 1.77 by root, Sun May 4 14:12:37 2008 UTC vs. Revision 1.109 by root, Wed Dec 5 19:03:26 2018 UTC

Diff Legend

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.77 by root, Sun May 4 14:12:37 2008 UTC vs.
Revision 1.109 by root, Wed Dec 5 19:03:26 2018 UTC