oj 3.11.0 → 3.16.5

data/ext/oj/cache8.c

@@ -1,107 +1,105 @@
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for license details.
+
+#include "cache8.h"
 
-#include <stdlib.h>
 #include <errno.h>
+#include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
 
+#include "mem.h"
 #include "ruby.h"
-#include "cache8.h"
 
-#define BITS		4
-#define MASK		0x000000000000000FULL
-#define SLOT_CNT	16
-#define DEPTH		16
+#define BITS 4
+#define MASK 0x000000000000000FULL
+#define SLOT_CNT 16
+#define DEPTH 16
 
 typedef union {
-    struct _cache8	*child;
-    slot_t		value;
+    struct _cache8 *child;
+    slot_t          value;
 } Bucket;
 
 struct _cache8 {
-    Bucket	buckets[SLOT_CNT];
+    Bucket buckets[SLOT_CNT];
 };
 
-static void	cache8_delete(Cache8 cache, int depth);
-static void	slot_print(Cache8 cache, sid_t key, unsigned int depth);
+static void cache8_delete(Cache8 cache, int depth);
+static void slot_print(Cache8 cache, sid_t key, unsigned int depth);
 
-void
-oj_cache8_new(Cache8 *cache) {
-    Bucket	*b;
-    int		i;
-    
-    *cache = ALLOC(struct _cache8);
+void oj_cache8_new(Cache8 *cache) {
+    Bucket *b;
+    int     i;
+
+    *cache = OJ_R_ALLOC(struct _cache8);
     for (i = SLOT_CNT, b = (*cache)->buckets; 0 < i; i--, b++) {
-	b->value = 0;
+        b->value = 0;
     }
 }
 
-void
-oj_cache8_delete(Cache8 cache) {
+void oj_cache8_delete(Cache8 cache) {
     cache8_delete(cache, 0);
 }
 
-static void
-cache8_delete(Cache8 cache, int depth) {
-    Bucket		*b;
-    unsigned int	i;
+static void cache8_delete(Cache8 cache, int depth) {
+    Bucket      *b;
+    unsigned int i;
 
     for (i = 0, b = cache->buckets; i < SLOT_CNT; i++, b++) {
-	if (0 != b->child) {
-	    if (DEPTH - 1 != depth) {
-		cache8_delete(b->child, depth + 1);
-	    }
-	}
+        if (0 != b->child) {
+            if (DEPTH - 1 != depth) {
+                cache8_delete(b->child, depth + 1);
+            }
+        }
     }
-    xfree(cache);
+    OJ_R_FREE(cache);
 }
 
-slot_t
-oj_cache8_get(Cache8 cache, sid_t key, slot_t **slot) {
-    Bucket	*b;
-    int		i;
-    sid_t	k8 = (sid_t)key;
-    sid_t	k;
-    
+slot_t oj_cache8_get(Cache8 cache, sid_t key, slot_t **slot) {
+    Bucket *b;
+    int     i;
+    sid_t   k8 = (sid_t)key;
+    sid_t   k;
+
     for (i = 64 - BITS; 0 < i; i -= BITS) {
-	k = (k8 >> i) & MASK;
-	b = cache->buckets + k;
-	if (0 == b->child) {
-	    oj_cache8_new(&b->child);
-	}
-	cache = b->child;
+        k = (k8 >> i) & MASK;
+        b = cache->buckets + k;
+        if (0 == b->child) {
+            oj_cache8_new(&b->child);
+        }
+        cache = b->child;
     }
     *slot = &(cache->buckets + (k8 & MASK))->value;
 
     return **slot;
 }
 
-void
-oj_cache8_print(Cache8 cache) {
+void oj_cache8_print(Cache8 cache) {
     /*printf("-------------------------------------------\n"); */
     slot_print(cache, 0, 0);
 }
 
-static void
-slot_print(Cache8 c, sid_t key, unsigned int depth) {
-    Bucket		*b;
-    unsigned int	i;
-    sid_t		k8 = (sid_t)key;
-    sid_t		k;
+static void slot_print(Cache8 c, sid_t key, unsigned int depth) {
+    Bucket      *b;
+    unsigned int i;
+    sid_t        k8 = (sid_t)key;
+    sid_t        k;
 
     for (i = 0, b = c->buckets; i < SLOT_CNT; i++, b++) {
-	if (0 != b->child) {
-	    k = (k8 << BITS) | i;
-	    /*printf("*** key: 0x%016llx  depth: %u  i: %u\n", k, depth, i); */
-	    if (DEPTH - 1 == depth) {
+        if (0 != b->child) {
+            k = (k8 << BITS) | i;
+            /*printf("*** key: 0x%016llx  depth: %u  i: %u\n", k, depth, i); */
+            if (DEPTH - 1 == depth) {
 #if IS_WINDOWS
-		printf("0x%016lx: %4lu\n", (long unsigned int)k, (long unsigned int)b->value);
+                printf("0x%016lx: %4lu\n", (long unsigned int)k, (long unsigned int)b->value);
 #else
-		printf("0x%016llx: %4llu\n", (long long unsigned int)k, (long long unsigned int)b->value);
+                printf("0x%016llx: %4llu\n", (long long unsigned int)k, (long long unsigned int)b->value);
 #endif
-	    } else {
-		slot_print(b->child, k, depth + 1);
-	    }
-	}
+            } else {
+                slot_print(b->child, k, depth + 1);
+            }
+        }
     }
 }

data/ext/oj/cache8.h

@@ -1,4 +1,5 @@
 // Copyright (c) 2011 Peter Ohler. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for license details.
 
 #ifndef OJ_CACHE8_H
 #define OJ_CACHE8_H
@@ -6,15 +7,15 @@
 #include "ruby.h"
 #include "stdint.h"
 
-typedef struct _cache8	*Cache8;
-typedef uint64_t	slot_t;
-typedef uint64_t	sid_t;
+typedef struct _cache8 *Cache8;
+typedef uint64_t        slot_t;
+typedef uint64_t        sid_t;
 
-extern void	oj_cache8_new(Cache8 *cache);
-extern void	oj_cache8_delete(Cache8 cache);
+extern void oj_cache8_new(Cache8 *cache);
+extern void oj_cache8_delete(Cache8 cache);
 
-extern slot_t	oj_cache8_get(Cache8 cache, sid_t key, slot_t **slot);
+extern slot_t oj_cache8_get(Cache8 cache, sid_t key, slot_t **slot);
 
-extern void	oj_cache8_print(Cache8 cache);
+extern void oj_cache8_print(Cache8 cache);
 
 #endif /* OJ_CACHE8_H */

data/ext/oj/circarray.c

@@ -1,64 +1,64 @@
 // Copyright (c) 2012 Peter Ohler. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for license details.
 
 #include "circarray.h"
 
-CircArray
-oj_circ_array_new() {
-    CircArray	ca;
+#include "mem.h"
 
-    if (0 == (ca = ALLOC(struct _circArray))) {
-	rb_raise(rb_eNoMemError, "not enough memory\n");
+CircArray oj_circ_array_new(void) {
+    CircArray ca;
+
+    if (0 == (ca = OJ_R_ALLOC(struct _circArray))) {
+        rb_raise(rb_eNoMemError, "not enough memory\n");
     }
     ca->objs = ca->obj_array;
     ca->size = sizeof(ca->obj_array) / sizeof(VALUE);
-    ca->cnt = 0;
+    ca->cnt  = 0;
 
     return ca;
 }
 
-void
-oj_circ_array_free(CircArray ca) {
+void oj_circ_array_free(CircArray ca) {
     if (ca->objs != ca->obj_array) {
-	xfree(ca->objs);
+        OJ_R_FREE(ca->objs);
     }
-    xfree(ca);
+    OJ_R_FREE(ca);
 }
 
-void
-oj_circ_array_set(CircArray ca, VALUE obj, unsigned long id) {
+void oj_circ_array_set(CircArray ca, VALUE obj, unsigned long id) {
     if (0 < id && 0 != ca) {
-	unsigned long	i;
+        unsigned long i;
 
-	if (ca->size < id) {
-	    unsigned long	cnt = id + 512;
+        if (ca->size < id) {
+            unsigned long cnt = id + 512;
 
-	    if (ca->objs == ca->obj_array) {
-		if (0 == (ca->objs = ALLOC_N(VALUE, cnt))) {
-		    rb_raise(rb_eNoMemError, "not enough memory\n");
-		}
-		memcpy(ca->objs, ca->obj_array, sizeof(VALUE) * ca->cnt);
-	    } else {
-		REALLOC_N(ca->objs, VALUE, cnt);
-	    }
-	    ca->size = cnt;
-	}
-	id--;
-	for (i = ca->cnt; i < id; i++) {
-	    ca->objs[i] = Qnil;
-	}
-	ca->objs[id] = obj;
-	if (ca->cnt <= id) {
-	    ca->cnt = id + 1;
-	}
+            if (ca->objs == ca->obj_array) {
+                if (0 == (ca->objs = OJ_R_ALLOC_N(VALUE, cnt))) {
+                    rb_raise(rb_eNoMemError, "not enough memory\n");
+                }
+                memcpy(ca->objs, ca->obj_array, sizeof(VALUE) * ca->cnt);
+            } else {
+                OJ_R_REALLOC_N(ca->objs, VALUE, cnt);
+            }
+            ca->size = cnt;
+        }
+        id--;
+        for (i = ca->cnt; i < id; i++) {
+            ca->objs[i] = Qnil;
+        }
+        ca->objs[id] = obj;
+        if (ca->cnt <= id) {
+            ca->cnt = id + 1;
+        }
     }
 }
 
 VALUE
 oj_circ_array_get(CircArray ca, unsigned long id) {
-    VALUE	obj = Qnil;
+    VALUE obj = Qnil;
 
     if (id <= ca->cnt && 0 != ca) {
-	obj = ca->objs[id - 1];
+        obj = ca->objs[id - 1];
     }
     return obj;
 }

data/ext/oj/circarray.h

@@ -1,4 +1,6 @@
 // Copyright (c) 2012 Peter Ohler. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for
+// license details.
 
 #ifndef OJ_CIRCARRAY_H
 #define OJ_CIRCARRAY_H
@@ -6,15 +8,15 @@
 #include "ruby.h"
 
 typedef struct _circArray {
-    VALUE		obj_array[1024];
-    VALUE		*objs;
-    unsigned long	size; // allocated size or initial array size
-    unsigned long	cnt;
-} *CircArray;
+    VALUE         obj_array[1024];
+    VALUE*        objs;
+    unsigned long size;  // allocated size or initial array size
+    unsigned long cnt;
+}* CircArray;
 
-extern CircArray	oj_circ_array_new(void);
-extern void		oj_circ_array_free(CircArray ca);
-extern void		oj_circ_array_set(CircArray ca, VALUE obj, unsigned long id);
-extern VALUE		oj_circ_array_get(CircArray ca, unsigned long id);
+extern CircArray oj_circ_array_new(void);
+extern void      oj_circ_array_free(CircArray ca);
+extern void      oj_circ_array_set(CircArray ca, VALUE obj, unsigned long id);
+extern VALUE     oj_circ_array_get(CircArray ca, unsigned long id);
 
 #endif /* OJ_CIRCARRAY_H */