ox 2.14.14 → 2.14.15

data/ext/ox/cache.c

@@ -34,7 +34,7 @@ typedef struct _slot {
     volatile uint32_t use_cnt;
     uint8_t           klen;
     char              key[CACHE_MAX_KEY];
-} * Slot;
+} *Slot;
 
 typedef struct _cache {
     volatile Slot  *slots;
@@ -52,7 +52,7 @@ typedef struct _cache {
 #endif
     uint8_t xrate;
     bool    mark;
-} * Cache;
+} *Cache;
 
 static uint64_t hash_calc(const uint8_t *key, size_t len) {
     const uint8_t *end     = key + len;

data/ext/ox/cache8.c

@@ -3,77 +3,74 @@
  * All rights reserved.
  */
 
-#include <stdlib.h>
+#include "cache8.h"
+
 #include <errno.h>
+#include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <stdarg.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
-ox_cache8_new(Cache8 *cache) {
-    Bucket	*b;
-    int		i;
+void ox_cache8_new(Cache8 *cache) {
+    Bucket *b;
+    int     i;
 
     *cache = ALLOC(struct _cache8);
     for (i = SLOT_CNT, b = (*cache)->buckets; 0 < i; i--, b++) {
-	b->value = 0;
+        b->value = 0;
     }
 }
 
-void
-ox_cache8_delete(Cache8 cache) {
+void ox_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);
 }
 
-slot_t
-ox_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 ox_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) {
-	    ox_cache8_new(&b->child);
-	}
-	cache = b->child;
+        k = (k8 >> i) & MASK;
+        b = cache->buckets + k;
+        if (0 == b->child) {
+            ox_cache8_new(&b->child);
+        }
+        cache = b->child;
     }
     *slot = &(cache->buckets + (k8 & MASK))->value;
 

data/ext/ox/cache8.h

@@ -9,15 +9,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	ox_cache8_new(Cache8 *cache);
-extern void	ox_cache8_delete(Cache8 cache);
+extern void ox_cache8_new(Cache8 *cache);
+extern void ox_cache8_delete(Cache8 cache);
 
-extern slot_t	ox_cache8_get(Cache8 cache, sid_t key, slot_t **slot);
+extern slot_t ox_cache8_get(Cache8 cache, sid_t key, slot_t **slot);
 
-//extern void	ox_cache8_print(Cache8 cache);
+// extern void	ox_cache8_print(Cache8 cache);
 
 #endif /* OX_CACHE8_H */