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.93 by root, Sat Nov 7 18:30:05 2009 UTC vs.
Revision 1.99 by root, Fri Apr 9 02:45:16 2010 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 (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * Deliantra is free software: you can redistribute it and/or modify it under 6 * Deliantra is free software: you can redistribute it and/or modify it under
7 * the terms of the Affero GNU General Public License as published by the 7 * the terms of the Affero GNU General Public License as published by the
8 * Free Software Foundation, either version 3 of the License, or (at your 8 * Free Software Foundation, either version 3 of the License, or (at your
9 * option) any later version. 9 * option) any later version.
… …
99 99
100// sign0 returns -1, 0 or +1 100// sign0 returns -1, 0 or +1
101template<typename T> 101template<typename T>
102static inline T sign0 (T v) { return v ? sign (v) : 0; } 102static inline T sign0 (T v) { return v ? sign (v) : 0; }
103 103
104template<typename T, typename U>
105static inline T copysign (T a, U b) { return a > 0 ? b : -b; }
106
104// div* only work correctly for div > 0 107// div* only work correctly for div > 0
105// div, with correct rounding (< 0.5 downwards, >=0.5 upwards) 108// div, with correct rounding (< 0.5 downwards, >=0.5 upwards)
106template<typename T> static inline T div (T val, T div) 109template<typename T> static inline T div (T val, T div)
107{ 110{
108 return expect_false (val < 0) ? - ((-val + (div - 1) / 2) / div) : (val + div / 2) / div; 111 return expect_false (val < 0) ? - ((-val + (div - 1) / 2) / div) : (val + div / 2) / div;
… …
186 int32_t d = b - a; 189 int32_t d = b - a;
187 d &= d >> 31; 190 d &= d >> 31;
188 return b - d; 191 return b - d;
189} 192}
190 193
191// this is much faster than crossfires original algorithm 194// this is much faster than crossfire's original algorithm
192// on modern cpus 195// on modern cpus
193inline int 196inline int
194isqrt (int n) 197isqrt (int n)
195{ 198{
196 return (int)sqrtf ((float)n); 199 return (int)sqrtf ((float)n);
… …
240absdir (int d) 243absdir (int d)
241{ 244{
242 return ((d - 1) & 7) + 1; 245 return ((d - 1) & 7) + 1;
243} 246}
244 247
248// avoid ctz name because netbsd or freebsd spams it's namespace with it
249#if GCC_VERSION(3,4)
250static inline int least_significant_bit (uint32_t x)
251{
252 return __builtin_ctz (x);
253}
254#else
255int least_significant_bit (uint32_t x);
256#endif
257
258#define for_all_bits_sparse_32(mask, idxvar) \
259 for (uint32_t idxvar, mask_ = mask; \
260 mask_ && ((idxvar = least_significant_bit (mask_)), mask_ &= ~(1 << idxvar), 1);)
261
245extern ssize_t slice_alloc; // statistics 262extern ssize_t slice_alloc; // statistics
246 263
247void *salloc_ (int n) throw (std::bad_alloc); 264void *salloc_ (int n) throw (std::bad_alloc);
248void *salloc_ (int n, void *src) throw (std::bad_alloc); 265void *salloc_ (int n, void *src) throw (std::bad_alloc);
249 266
… …
546typedef refptr<object> object_ptr; 563typedef refptr<object> object_ptr;
547typedef refptr<archetype> arch_ptr; 564typedef refptr<archetype> arch_ptr;
548typedef refptr<client> client_ptr; 565typedef refptr<client> client_ptr;
549typedef refptr<player> player_ptr; 566typedef refptr<player> player_ptr;
550 567
568#define STRHSH_NULL 2166136261
569
570static inline uint32_t
571strhsh (const char *s)
572{
573 // use FNV-1a hash (http://isthe.com/chongo/tech/comp/fnv/)
574 // it is about twice as fast as the one-at-a-time one,
575 // with good distribution.
576 // FNV-1a is faster on many cpus because the multiplication
577 // runs concurrently with the looping logic.
578 uint32_t hash = STRHSH_NULL;
579
580 while (*s)
581 hash = (hash ^ *s++) * 16777619U;
582
583 return hash;
584}
585
586static inline uint32_t
587memhsh (const char *s, size_t len)
588{
589 uint32_t hash = STRHSH_NULL;
590
591 while (len--)
592 hash = (hash ^ *s++) * 16777619U;
593
594 return hash;
595}
596
551struct str_hash 597struct str_hash
552{ 598{
553 std::size_t operator ()(const char *s) const 599 std::size_t operator ()(const char *s) const
554 { 600 {
555#if 0
556 uint32_t hash = 0;
557
558 /* use the one-at-a-time hash function, which supposedly is
559 * better than the djb2-like one used by perl5.005, but
560 * certainly is better then the bug used here before.
561 * see http://burtleburtle.net/bob/hash/doobs.html
562 */
563 while (*s)
564 {
565 hash += *s++;
566 hash += hash << 10;
567 hash ^= hash >> 6;
568 }
569
570 hash += hash << 3;
571 hash ^= hash >> 11;
572 hash += hash << 15;
573#else
574 // use FNV-1a hash (http://isthe.com/chongo/tech/comp/fnv/)
575 // it is about twice as fast as the one-at-a-time one,
576 // with good distribution.
577 // FNV-1a is faster on many cpus because the multiplication
578 // runs concurrent with the looping logic.
579 uint32_t hash = 2166136261;
580
581 while (*s)
582 hash = (hash ^ *s++) * 16777619;
583#endif
584
585 return hash; 601 return strhsh (s);
602 }
603
604 std::size_t operator ()(const shstr &s) const
605 {
606 return strhsh (s);
586 } 607 }
587}; 608};
588 609
589struct str_equal 610struct str_equal
590{ 611{

Diff Legend

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