ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/util.h
(Generate patch)

Comparing deliantra/server/include/util.h (file contents):
Revision 1.92 by root, Tue Oct 20 05:57:08 2009 UTC vs.
Revision 1.95 by root, Tue Nov 10 00:01:31 2009 UTC

… …
21 */ 21 */
22 22
23#ifndef UTIL_H__ 23#ifndef UTIL_H__
24#define UTIL_H__ 24#define UTIL_H__
25 25
26#include <compiler.h>
27
26#define DEBUG_POISON 0x00 // poison memory before freeing it if != 0 28#define DEBUG_POISON 0x00 // poison memory before freeing it if != 0
27#define DEBUG_SALLOC 0 // add a debug wrapper around all sallocs 29#define DEBUG_SALLOC 0 // add a debug wrapper around all sallocs
28#define PREFER_MALLOC 0 // use malloc and not the slice allocator 30#define PREFER_MALLOC 0 // use malloc and not the slice allocator
29
30#if __GNUC__ >= 3
31# define is_constant(c) __builtin_constant_p (c)
32# define expect(expr,value) __builtin_expect ((expr),(value))
33# define prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
34# define noinline __attribute__((__noinline__))
35#else
36# define is_constant(c) 0
37# define expect(expr,value) (expr)
38# define prefetch(addr,rw,locality)
39# define noinline
40#endif
41
42#if __GNUC__ < 4 || (__GNUC__ == 4 || __GNUC_MINOR__ < 4)
43# define decltype(x) typeof(x)
44#endif
45
46// put into ifs if you are very sure that the expression
47// is mostly true or mosty false. note that these return
48// booleans, not the expression.
49#define expect_false(expr) expect ((expr) ? 1 : 0, 0)
50#define expect_true(expr) expect ((expr) ? 1 : 0, 1)
51 31
52#include <pthread.h> 32#include <pthread.h>
53 33
54#include <cstddef> 34#include <cstddef>
55#include <cmath> 35#include <cmath>
… …
206 int32_t d = b - a; 186 int32_t d = b - a;
207 d &= d >> 31; 187 d &= d >> 31;
208 return b - d; 188 return b - d;
209} 189}
210 190
211// this is much faster than crossfires original algorithm 191// this is much faster than crossfire's original algorithm
212// on modern cpus 192// on modern cpus
213inline int 193inline int
214isqrt (int n) 194isqrt (int n)
215{ 195{
216 return (int)sqrtf ((float)n); 196 return (int)sqrtf ((float)n);
… …
566typedef refptr<object> object_ptr; 546typedef refptr<object> object_ptr;
567typedef refptr<archetype> arch_ptr; 547typedef refptr<archetype> arch_ptr;
568typedef refptr<client> client_ptr; 548typedef refptr<client> client_ptr;
569typedef refptr<player> player_ptr; 549typedef refptr<player> player_ptr;
570 550
551#define STRHSH_NULL 2166136261
552
553static inline uint32_t
554strhsh (const char *s)
555{
556 // use FNV-1a hash (http://isthe.com/chongo/tech/comp/fnv/)
557 // it is about twice as fast as the one-at-a-time one,
558 // with good distribution.
559 // FNV-1a is faster on many cpus because the multiplication
560 // runs concurrently with the looping logic.
561 uint32_t hash = STRHSH_NULL;
562
563 while (*s)
564 hash = (hash ^ *s++) * 16777619;
565
566 return hash;
567}
568
569static inline uint32_t
570memhsh (const char *s, size_t len)
571{
572 uint32_t hash = STRHSH_NULL;
573
574 while (len--)
575 hash = (hash ^ *s++) * 16777619;
576
577 return hash;
578}
579
571struct str_hash 580struct str_hash
572{ 581{
573 std::size_t operator ()(const char *s) const 582 std::size_t operator ()(const char *s) const
574 { 583 {
575#if 0
576 uint32_t hash = 0;
577
578 /* use the one-at-a-time hash function, which supposedly is
579 * better than the djb2-like one used by perl5.005, but
580 * certainly is better then the bug used here before.
581 * see http://burtleburtle.net/bob/hash/doobs.html
582 */
583 while (*s)
584 {
585 hash += *s++;
586 hash += hash << 10;
587 hash ^= hash >> 6;
588 }
589
590 hash += hash << 3;
591 hash ^= hash >> 11;
592 hash += hash << 15;
593#else
594 // use FNV-1a hash (http://isthe.com/chongo/tech/comp/fnv/)
595 // it is about twice as fast as the one-at-a-time one,
596 // with good distribution.
597 // FNV-1a is faster on many cpus because the multiplication
598 // runs concurrent with the looping logic.
599 uint32_t hash = 2166136261;
600
601 while (*s)
602 hash = (hash ^ *s++) * 16777619;
603#endif
604
605 return hash; 584 return strhsh (s);
585 }
586
587 std::size_t operator ()(const shstr &s) const
588 {
589 return strhsh (s);
606 } 590 }
607}; 591};
608 592
609struct str_equal 593struct str_equal
610{ 594{
… …
722 706
723int similar_direction (int a, int b); 707int similar_direction (int a, int b);
724 708
725// like v?sprintf, but returns a "static" buffer 709// like v?sprintf, but returns a "static" buffer
726char *vformat (const char *format, va_list ap); 710char *vformat (const char *format, va_list ap);
727char *format (const char *format, ...); 711char *format (const char *format, ...) attribute ((format (printf, 1, 2)));
728 712
729// safety-check player input which will become object->msg 713// safety-check player input which will become object->msg
730bool msg_is_safe (const char *msg); 714bool msg_is_safe (const char *msg);
731 715
732///////////////////////////////////////////////////////////////////////////// 716/////////////////////////////////////////////////////////////////////////////

Diff Legend

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