summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryexo <yexo@openttd.org>2010-03-19 20:13:15 +0000
committeryexo <yexo@openttd.org>2010-03-19 20:13:15 +0000
commit787ccc692c6ade5cf923e54245914a4440088800 (patch)
tree2e452d22d4c0f6b1d6acf24997d73a84c88da5e8
parente70bfdf789ba5ac46241239e8129d87d3ab79a8b (diff)
downloadopenttd-787ccc692c6ade5cf923e54245914a4440088800.tar.xz
(svn r19472) -Codechange: reorder the static members of ByteBlob and add Zero() (skidd13)
-rw-r--r--src/misc/blob.hpp81
1 files changed, 44 insertions, 37 deletions
diff --git a/src/misc/blob.hpp b/src/misc/blob.hpp
index 6c8db42fb..25d84e050 100644
--- a/src/misc/blob.hpp
+++ b/src/misc/blob.hpp
@@ -89,11 +89,52 @@ public:
}
protected:
- /** initialize the empty blob by setting the header pointer to the static BlobHeader with
- * both items and capacity containing zero */
+ /** all allocation should happen here */
+ static FORCEINLINE BlobHeader *RawAlloc(uint num_bytes)
+ {
+ return (BlobHeader*)MallocT<byte>(num_bytes);
+ }
+
+ /** Return header pointer to the static BlobHeader with
+ * both items and capacity containing zero */
+ static FORCEINLINE BlobHeader *Zero()
+ {
+ return const_cast<BlobHeader *>(&ByteBlob::hdrEmpty[1]);
+ }
+
+ /** simple allocation policy - can be optimized later */
+ static FORCEINLINE uint AllocPolicy(uint min_alloc)
+ {
+ if (min_alloc < (1 << 9)) {
+ if (min_alloc < (1 << 5)) return (1 << 5);
+ return (min_alloc < (1 << 7)) ? (1 << 7) : (1 << 9);
+ }
+ if (min_alloc < (1 << 15)) {
+ if (min_alloc < (1 << 11)) return (1 << 11);
+ return (min_alloc < (1 << 13)) ? (1 << 13) : (1 << 15);
+ }
+ if (min_alloc < (1 << 20)) {
+ if (min_alloc < (1 << 17)) return (1 << 17);
+ return (min_alloc < (1 << 19)) ? (1 << 19) : (1 << 20);
+ }
+ min_alloc = (min_alloc | ((1 << 20) - 1)) + 1;
+ return min_alloc;
+ }
+
+ /** all deallocations should happen here */
+ static FORCEINLINE void RawFree(BlobHeader *p)
+ {
+ /* Just to silence an unsilencable GCC 4.4+ warning. */
+ assert(p != ByteBlob::hdrEmpty);
+
+ /* In case GCC warns about the following, see GCC's PR38509 why it is bogus. */
+ free(p);
+ }
+
+ /** initialize the empty blob */
FORCEINLINE void InitEmpty()
{
- header = const_cast<BlobHeader *>(&ByteBlob::hdrEmpty[1]);
+ header = Zero();
}
/** initialize blob by attaching it to the given header followed by data */
@@ -217,40 +258,6 @@ public:
RawFree(pOldHdr);
}
- /** simple allocation policy - can be optimized later */
- FORCEINLINE static uint AllocPolicy(uint min_alloc)
- {
- if (min_alloc < (1 << 9)) {
- if (min_alloc < (1 << 5)) return (1 << 5);
- return (min_alloc < (1 << 7)) ? (1 << 7) : (1 << 9);
- }
- if (min_alloc < (1 << 15)) {
- if (min_alloc < (1 << 11)) return (1 << 11);
- return (min_alloc < (1 << 13)) ? (1 << 13) : (1 << 15);
- }
- if (min_alloc < (1 << 20)) {
- if (min_alloc < (1 << 17)) return (1 << 17);
- return (min_alloc < (1 << 19)) ? (1 << 19) : (1 << 20);
- }
- min_alloc = (min_alloc | ((1 << 20) - 1)) + 1;
- return min_alloc;
- }
-
- /** all allocation should happen here */
- static FORCEINLINE BlobHeader *RawAlloc(uint num_bytes)
- {
- return (BlobHeader*)MallocT<byte>(num_bytes);
- }
-
- /** all deallocations should happen here */
- static FORCEINLINE void RawFree(BlobHeader *p)
- {
- /* Just to silence an unsilencable GCC 4.4+ warning. */
- assert(p != ByteBlob::hdrEmpty);
-
- /* In case GCC warns about the following, see GCC's PR38509 why it is bogus. */
- free(p);
- }
/** fixing the four bytes at the end of blob data - useful when blob is used to hold string */
FORCEINLINE void FixTail() const
{