isomorfeus-ferret 0.17.1 → 0.17.3

data/ext/isomorfeus_ferret_ext/frt_store.c

@@ -1,9 +1,6 @@
 #include "frt_store.h"
 #include <string.h>
 
-#define VINT_MAX_LEN 10
-#define VINT_END FRT_BUFFER_SIZE - VINT_MAX_LEN
-
 /*
  * TODO: add try finally
  */
@@ -18,8 +15,8 @@ void frt_with_lock(FrtLock *lock, void (*func)(void *arg), void *arg) {
 /*
  * TODO: add try finally
  */
-void frt_with_lock_name(FrtStore *store, const char *lock_name, void (*func)(void *arg), void *arg) {
-    FrtLock *lock = store->open_lock_i(store, lock_name);
+void frt_with_lock_name(FrtStore *store, const char *folder_name, const char *lock_name, void (*func)(void *arg), void *arg) {
+    FrtLock *lock = store->open_lock_i(store, folder_name, lock_name);
     if (!lock->obtain(lock)) {
         FRT_RAISE(FRT_LOCK_ERROR, "couldn't obtain lock \"%s\"", lock->name);
     }
@@ -28,20 +25,17 @@ void frt_with_lock_name(FrtStore *store, const char *lock_name, void (*func)(voi
     store->close_lock_i(lock);
 }
 
-FrtLock *frt_open_lock(FrtStore *store, const char *lockname)
-{
-    FrtLock *lock = store->open_lock_i(store, lockname);
+FrtLock *frt_open_lock(FrtStore *store, const char *folder_name, const char *lockname) {
+    FrtLock *lock = store->open_lock_i(store, folder_name, lockname);
     frt_hs_add(store->locks, lock);
     return lock;
 }
 
-void frt_close_lock(FrtLock *lock)
-{
+void frt_close_lock(FrtLock *lock) {
     frt_hs_del(lock->store->locks, lock);
 }
 
-static void frt_close_lock_i(FrtLock *lock)
-{
+static void frt_close_lock_i(FrtLock *lock) {
     lock->store->close_lock_i(lock);
 }
 
@@ -87,517 +81,6 @@ void frt_store_close(FrtStore *store) {
     }
 }
 
-/**
- * Create a newly allocated and initialized OutStream object
- *
- * @return a newly allocated and initialized OutStream object
- */
-FrtOutStream *frt_os_new(void) {
-    FrtOutStream *os = FRT_ALLOC(FrtOutStream);
-    os->buf.start = 0;
-    os->buf.pos = 0;
-    os->buf.len = 0;
-    return os;
-}
-
-/**
- * Flush the countents of the FrtOutStream's buffers
- *
- * @param the OutStream to flush
- */
-void frt_os_flush(FrtOutStream *os)
-{
-    os->m->flush_i(os, os->buf.buf, os->buf.pos);
-    os->buf.start += os->buf.pos;
-    os->buf.pos = 0;
-}
-
-void frt_os_close(FrtOutStream *os)
-{
-    frt_os_flush(os);
-    os->m->close_i(os);
-    free(os);
-}
-
-off_t frt_os_pos(FrtOutStream *os)
-{
-    return os->buf.start + os->buf.pos;
-}
-
-void frt_os_seek(FrtOutStream *os, frt_off_t new_pos)
-{
-    frt_os_flush(os);
-    os->buf.start = new_pos;
-    os->m->seek_i(os, new_pos);
-}
-
-/**
- * Unsafe alternative to os_write_byte. Only use this method if you know there
- * is no chance of buffer overflow.
- */
-#define write_byte(os, b) os->buf.buf[os->buf.pos++] = (frt_uchar)b
-
-/**
- * Write a single byte +b+ to the OutStream +os+
- *
- * @param os the OutStream to write to
- * @param b  the byte to write
- * @raise FRT_IO_ERROR if there is an IO error writing to the filesystem
- */
-void frt_os_write_byte(FrtOutStream *os, frt_uchar b)
-{
-    if (os->buf.pos >= (FRT_BUFFER_SIZE - 1)) {
-        frt_os_flush(os);
-    }
-    write_byte(os, b);
-}
-
-void frt_os_write_bytes(FrtOutStream *os, const frt_uchar *buf, int len)
-{
-    if (len < (FRT_BUFFER_SIZE - os->buf.pos)) {
-        memcpy(os->buf.buf + os->buf.pos, buf, len);
-        os->buf.pos += len;
-    }
-    else {
-        frt_os_flush(os);
-        int pos = 0;
-        int size;
-        while (pos < len) {
-            if (len - pos < FRT_BUFFER_SIZE) {
-                size = len - pos;
-            }
-            else {
-                size = FRT_BUFFER_SIZE;
-            }
-            os->m->flush_i(os, buf + pos, size);
-            pos += size;
-            os->buf.start += size;
-        }
-    }
-}
-
-/**
- * Create a newly allocated and initialized InStream
- *
- * @return a newly allocated and initialized InStream
- */
-FrtInStream *frt_is_new(void) {
-    FrtInStream *is = FRT_ALLOC(FrtInStream);
-    is->f = FRT_ALLOC_AND_ZERO(FrtInStreamFile);
-    is->f->ref_cnt = 1;
-    is->buf.start = 0;
-    is->buf.pos = 0;
-    is->buf.len = 0;
-    is->ref_cnt = 1;
-    return is;
-}
-
-/**
- * Refill the InStream's buffer from the store source (filesystem or memory).
- *
- * @param is the InStream to refill
- * @raise FRT_IO_ERROR if there is a error reading from the filesystem
- * @raise FRT_EOF_ERROR if there is an attempt to read past the end of the file
- */
-static void is_refill(FrtInStream *is)
-{
-    frt_off_t start = is->buf.start + is->buf.pos;
-    frt_off_t last = start + FRT_BUFFER_SIZE;
-    frt_off_t flen = is->m->length_i(is);
-
-    if (last > flen) {          /* don't read past EOF */
-        last = flen;
-    }
-
-    is->buf.len = last - start;
-    if (is->buf.len <= 0) {
-        FRT_RAISE(FRT_EOF_ERROR, "current pos = %"FRT_OFF_T_PFX"d, "
-              "file length = %"FRT_OFF_T_PFX"d", start, flen);
-    }
-
-    is->m->read_i(is, is->buf.buf, is->buf.len);
-
-    is->buf.start = start;
-    is->buf.pos = 0;
-}
-
-/**
- * Unsafe alternative to frt_is_read_byte. Only use this method when you know
- * there is no chance that you will read past the end of the InStream's
- * buffer.
- */
-#define read_byte(is) is->buf.buf[is->buf.pos++]
-
-/**
- * Read a singly byte (unsigned char) from the InStream +is+.
- *
- * @param is the Instream to read from
- * @return a single unsigned char read from the InStream +is+
- * @raise FRT_IO_ERROR if there is a error reading from the filesystem
- * @raise FRT_EOF_ERROR if there is an attempt to read past the end of the file
- */
-frt_uchar frt_is_read_byte(FrtInStream *is)
-{
-    if (is->buf.pos >= is->buf.len) {
-        is_refill(is);
-    }
-
-    return read_byte(is);
-}
-
-off_t frt_is_pos(FrtInStream *is)
-{
-    return is->buf.start + is->buf.pos;
-}
-
-frt_uchar *frt_is_read_bytes(FrtInStream *is, frt_uchar *buf, int len)
-{
-    int i;
-    frt_off_t start;
-
-    if ((is->buf.pos + len) < is->buf.len) {
-        for (i = 0; i < len; i++) {
-            buf[i] = read_byte(is);
-        }
-    }
-    else {                              /* read all-at-once */
-        start = frt_is_pos(is);
-        is->m->seek_i(is, start);
-        is->m->read_i(is, buf, len);
-
-        is->buf.start = start + len;    /* adjust stream variables */
-        is->buf.pos = 0;
-        is->buf.len = 0;                /* trigger refill on read */
-    }
-    return buf;
-}
-
-void frt_is_seek(FrtInStream *is, frt_off_t pos) {
-    if (pos >= is->buf.start && pos < (is->buf.start + is->buf.len)) {
-        is->buf.pos = pos - is->buf.start;  /* seek within buffer */
-    } else {
-        is->buf.start = pos;
-        is->buf.pos = 0;
-        is->buf.len = 0;                    /* trigger refill() on read() */
-        is->m->seek_i(is, pos);
-    }
-}
-
-void frt_is_close(FrtInStream *is) {
-    if (is->ref_cnt == 0) {
-        FRT_RAISE(FRT_STATE_ERROR, "is ref_cnt to low\n");
-    }
-
-    if (FRT_DEREF(is) == 0) {
-        if (FRT_DEREF(is->f) == 0) {
-            is->m->close_i(is);
-            free(is->f);
-        }
-        free(is);
-    }
-}
-
-FrtInStream *frt_is_clone(FrtInStream *is)
-{
-    if (!(is->f))
-        return NULL;
-    FrtInStream *new_is = FRT_ALLOC(FrtInStream);
-    memcpy(new_is, is, sizeof(FrtInStream));
-    new_is->ref_cnt = 1;
-    FRT_REF(new_is->f);
-    return new_is;
-}
-
-frt_i32 frt_is_read_i32(FrtInStream *is)
-{
-    return ((frt_i32)frt_is_read_byte(is) << 24) |
-        ((frt_i32)frt_is_read_byte(is) << 16) |
-        ((frt_i32)frt_is_read_byte(is) << 8) |
-        ((frt_i32)frt_is_read_byte(is));
-}
-
-
-frt_i64 frt_is_read_i64(FrtInStream *is)
-{
-    return ((frt_i64)frt_is_read_byte(is) << 56) |
-        ((frt_i64)frt_is_read_byte(is) << 48) |
-        ((frt_i64)frt_is_read_byte(is) << 40) |
-        ((frt_i64)frt_is_read_byte(is) << 32) |
-        ((frt_i64)frt_is_read_byte(is) << 24) |
-        ((frt_i64)frt_is_read_byte(is) << 16) |
-        ((frt_i64)frt_is_read_byte(is) << 8) |
-        ((frt_i64)frt_is_read_byte(is));
-}
-
-frt_u32 frt_is_read_u32(FrtInStream *is)
-{
-    return ((frt_u32)frt_is_read_byte(is) << 24) |
-        ((frt_u32)frt_is_read_byte(is) << 16) |
-        ((frt_u32)frt_is_read_byte(is) << 8) |
-        ((frt_u32)frt_is_read_byte(is));
-}
-
-frt_u64 frt_is_read_u64(FrtInStream *is)
-{
-    return ((frt_u64)frt_is_read_byte(is) << 56) |
-        ((frt_u64)frt_is_read_byte(is) << 48) |
-        ((frt_u64)frt_is_read_byte(is) << 40) |
-        ((frt_u64)frt_is_read_byte(is) << 32) |
-        ((frt_u64)frt_is_read_byte(is) << 24) |
-        ((frt_u64)frt_is_read_byte(is) << 16) |
-        ((frt_u64)frt_is_read_byte(is) << 8) |
-        ((frt_u64)frt_is_read_byte(is));
-}
-
-/* optimized to use unchecked read_byte if there is definitely space */
-unsigned int frt_is_read_vint(FrtInStream *is)
-{
-    register unsigned int res, b;
-    register int shift = 7;
-
-    if (is->buf.pos > (is->buf.len - VINT_MAX_LEN)) {
-        b = frt_is_read_byte(is);
-        res = b & 0x7F;                 /* 0x7F = 0b01111111 */
-
-        while ((b & 0x80) != 0) {       /* 0x80 = 0b10000000 */
-            b = frt_is_read_byte(is);
-            res |= (b & 0x7F) << shift;
-            shift += 7;
-        }
-    }
-    else {                              /* unchecked optimization */
-        b = read_byte(is);
-        res = b & 0x7F;                 /* 0x7F = 0b01111111 */
-
-        while ((b & 0x80) != 0) {       /* 0x80 = 0b10000000 */
-            b = read_byte(is);
-            res |= (b & 0x7F) << shift;
-            shift += 7;
-        }
-    }
-
-    return res;
-}
-
-/* optimized to use unchecked read_byte if there is definitely space */
-off_t frt_is_read_voff_t(FrtInStream *is)
-{
-    register frt_off_t res, b;
-    register int shift = 7;
-
-    if (is->buf.pos > (is->buf.len - VINT_MAX_LEN)) {
-        b = frt_is_read_byte(is);
-        res = b & 0x7F;                 /* 0x7F = 0b01111111 */
-
-        while ((b & 0x80) != 0) {       /* 0x80 = 0b10000000 */
-            b = frt_is_read_byte(is);
-            res |= (b & 0x7F) << shift;
-            shift += 7;
-        }
-    }
-    else {                              /* unchecked optimization */
-        b = read_byte(is);
-        res = b & 0x7F;                 /* 0x7F = 0b01111111 */
-
-        while ((b & 0x80) != 0) {       /* 0x80 = 0b10000000 */
-            b = read_byte(is);
-            res |= (b & 0x7F) << shift;
-            shift += 7;
-        }
-    }
-
-    return res;
-}
-
-/* optimized to use unchecked read_byte if there is definitely space */
-frt_u64 frt_is_read_vll(FrtInStream *is)
-{
-    register frt_u64 res, b;
-    register int shift = 7;
-
-    if (is->buf.pos > (is->buf.len - VINT_MAX_LEN)) {
-        b = frt_is_read_byte(is);
-        res = b & 0x7F;                 /* 0x7F = 0b01111111 */
-
-        while ((b & 0x80) != 0) {       /* 0x80 = 0b10000000 */
-            b = frt_is_read_byte(is);
-            res |= (b & 0x7F) << shift;
-            shift += 7;
-        }
-    }
-    else {                              /* unchecked optimization */
-        b = read_byte(is);
-        res = b & 0x7F;                 /* 0x7F = 0b01111111 */
-
-        while ((b & 0x80) != 0) {       /* 0x80 = 0b10000000 */
-            b = read_byte(is);
-            res |= (b & 0x7F) << shift;
-            shift += 7;
-        }
-    }
-
-    return res;
-}
-
-void frt_is_skip_vints(FrtInStream *is, register int cnt)
-{
-    for (; cnt > 0; cnt--) {
-        while ((frt_is_read_byte(is) & 0x80) != 0) {
-        }
-    }
-}
-
-char *frt_is_read_string(FrtInStream *is)
-{
-    register int length = (int) frt_is_read_vint(is);
-    char *str = FRT_ALLOC_N(char, length + 1);
-    str[length] = '\0';
-
-    if (is->buf.pos > (is->buf.len - length)) {
-        register int i;
-        for (i = 0; i < length; i++) {
-            str[i] = frt_is_read_byte(is);
-        }
-    }
-    else {                      /* unchecked optimization */
-        memcpy(str, is->buf.buf + is->buf.pos, length);
-        is->buf.pos += length;
-    }
-
-    return str;
-}
-
-char *frt_is_read_string_safe(FrtInStream *is)
-{
-    register int length = (int) frt_is_read_vint(is);
-    char *str = FRT_ALLOC_N(char, length + 1);
-    str[length] = '\0';
-
-    FRT_TRY
-        if (is->buf.pos > (is->buf.len - length)) {
-            register int i;
-            for (i = 0; i < length; i++) {
-                str[i] = frt_is_read_byte(is);
-            }
-        }
-        else {                      /* unchecked optimization */
-            memcpy(str, is->buf.buf + is->buf.pos, length);
-            is->buf.pos += length;
-        }
-    FRT_XCATCHALL
-        free(str);
-    FRT_XENDTRY
-
-    return str;
-}
-
-void frt_os_write_i32(FrtOutStream *os, frt_i32 num)
-{
-    frt_os_write_byte(os, (frt_uchar)((num >> 24) & 0xFF));
-    frt_os_write_byte(os, (frt_uchar)((num >> 16) & 0xFF));
-    frt_os_write_byte(os, (frt_uchar)((num >> 8) & 0xFF));
-    frt_os_write_byte(os, (frt_uchar)(num & 0xFF));
-}
-
-void frt_os_write_i64(FrtOutStream *os, frt_i64 num)
-{
-    frt_os_write_byte(os, (frt_uchar)((num >> 56) & 0xFF));
-    frt_os_write_byte(os, (frt_uchar)((num >> 48) & 0xFF));
-    frt_os_write_byte(os, (frt_uchar)((num >> 40) & 0xFF));
-    frt_os_write_byte(os, (frt_uchar)((num >> 32) & 0xFF));
-    frt_os_write_byte(os, (frt_uchar)((num >> 24) & 0xFF));
-    frt_os_write_byte(os, (frt_uchar)((num >> 16) & 0xFF));
-    frt_os_write_byte(os, (frt_uchar)((num >> 8) & 0xFF));
-    frt_os_write_byte(os, (frt_uchar)(num & 0xFF));
-}
-
-void frt_os_write_u32(FrtOutStream *os, frt_u32 num)
-{
-    frt_os_write_byte(os, (frt_uchar)((num >> 24) & 0xFF));
-    frt_os_write_byte(os, (frt_uchar)((num >> 16) & 0xFF));
-    frt_os_write_byte(os, (frt_uchar)((num >> 8) & 0xFF));
-    frt_os_write_byte(os, (frt_uchar)(num & 0xFF));
-}
-
-void frt_os_write_u64(FrtOutStream *os, frt_u64 num)
-{
-    frt_os_write_byte(os, (frt_uchar)((num >> 56) & 0xFF));
-    frt_os_write_byte(os, (frt_uchar)((num >> 48) & 0xFF));
-    frt_os_write_byte(os, (frt_uchar)((num >> 40) & 0xFF));
-    frt_os_write_byte(os, (frt_uchar)((num >> 32) & 0xFF));
-    frt_os_write_byte(os, (frt_uchar)((num >> 24) & 0xFF));
-    frt_os_write_byte(os, (frt_uchar)((num >> 16) & 0xFF));
-    frt_os_write_byte(os, (frt_uchar)((num >> 8) & 0xFF));
-    frt_os_write_byte(os, (frt_uchar)(num & 0xFF));
-}
-
-/* optimized to use an unchecked write if there is space */
-void frt_os_write_vint(FrtOutStream *os, register unsigned int num)
-{
-    if (os->buf.pos > VINT_END) {
-        while (num > 127) {
-            frt_os_write_byte(os, (frt_uchar)((num & 0x7f) | 0x80));
-            num >>= 7;
-        }
-        frt_os_write_byte(os, (frt_uchar)(num));
-    }
-    else {
-        while (num > 127) {
-            write_byte(os, (frt_uchar)((num & 0x7f) | 0x80));
-            num >>= 7;
-        }
-        write_byte(os, (frt_uchar)(num));
-    }
-}
-
-/* optimized to use an unchecked write if there is space */
-void frt_os_write_voff_t(FrtOutStream *os, register frt_off_t num)
-{
-    if (os->buf.pos > VINT_END) {
-        while (num > 127) {
-            frt_os_write_byte(os, (frt_uchar)((num & 0x7f) | 0x80));
-            num >>= 7;
-        }
-        frt_os_write_byte(os, (frt_uchar)num);
-    }
-    else {
-        while (num > 127) {
-            write_byte(os, (frt_uchar)((num & 0x7f) | 0x80));
-            num >>= 7;
-        }
-        write_byte(os, (frt_uchar)num);
-    }
-}
-
-/* optimized to use an unchecked write if there is space */
-void frt_os_write_vll(FrtOutStream *os, register frt_u64 num)
-{
-    if (os->buf.pos > VINT_END) {
-        while (num > 127) {
-            frt_os_write_byte(os, (frt_uchar)((num & 0x7f) | 0x80));
-            num >>= 7;
-        }
-        frt_os_write_byte(os, (frt_uchar)num);
-    }
-    else {
-        while (num > 127) {
-            write_byte(os, (frt_uchar)((num & 0x7f) | 0x80));
-            num >>= 7;
-        }
-        write_byte(os, (frt_uchar)num);
-    }
-}
-
-void frt_os_write_string_len(FrtOutStream *os, const char *str, int len)
-{
-    frt_os_write_vint(os, len);
-    frt_os_write_bytes(os, (frt_uchar *)str, len);
-}
-void frt_os_write_string(FrtOutStream *os, const char *str)
-{
-    frt_os_write_string_len(os, str, (int)strlen(str));
-}
-
 /**
  * Determine if the filename is the name of a lock file. Return 1 if it is, 0
  * otherwise.
@@ -605,14 +88,12 @@ void frt_os_write_string(FrtOutStream *os, const char *str)
  * @param filename the name of the file to check
  * @return 1 (true) if the file is a lock file, 0 (false) otherwise
  */
-int frt_file_is_lock(const char *filename)
-{
+int frt_file_is_lock(const char *filename) {
     int start = (int) strlen(filename) - 4;
     return ((start > 0) && (strcmp(FRT_LOCK_EXT, &filename[start]) == 0));
 }
 
-void frt_is2os_copy_bytes(FrtInStream *is, FrtOutStream *os, int cnt)
-{
+void frt_is2os_copy_bytes(FrtInStream *is, FrtOutStream *os, int cnt) {
     int len;
     frt_uchar buf[FRT_BUFFER_SIZE];
 
@@ -623,8 +104,7 @@ void frt_is2os_copy_bytes(FrtInStream *is, FrtOutStream *os, int cnt)
     }
 }
 
-void frt_is2os_copy_vints(FrtInStream *is, FrtOutStream *os, int cnt)
-{
+void frt_is2os_copy_vints(FrtInStream *is, FrtOutStream *os, int cnt) {
     frt_uchar b;
     for (; cnt > 0; cnt--) {
         while (((b = frt_is_read_byte(is)) & 0x80) != 0) {
@@ -637,8 +117,7 @@ void frt_is2os_copy_vints(FrtInStream *is, FrtOutStream *os, int cnt)
 /**
  * Test argument used to test the store->each function
  */
-struct FileNameListArg
-{
+struct FileNameListArg {
     int count;
     int size;
     int total_len;
@@ -648,8 +127,7 @@ struct FileNameListArg
 /**
  * Test function used to test store->each function
  */
-static void add_file_name(const char *fname, void *arg)
-{
+static void add_file_name(const char *fname, void *arg) {
     struct FileNameListArg *fnl = (struct FileNameListArg *)arg;
     if (fnl->count >= fnl->size) {
         fnl->size *= 2;
@@ -659,8 +137,7 @@ static void add_file_name(const char *fname, void *arg)
     fnl->total_len += strlen(fname) + 2;
 }
 
-char *frt_store_to_s(FrtStore *store)
-{
+char *frt_store_folder_to_s(FrtStore *store, const char *folder_name) {
     struct FileNameListArg fnl;
     char *buf, *b;
     int i;
@@ -669,7 +146,7 @@ char *frt_store_to_s(FrtStore *store)
     fnl.total_len = 10;
     fnl.files = FRT_ALLOC_N(char *, 16);
 
-    store->each(store, &add_file_name, &fnl);
+    store->each(store, folder_name, &add_file_name, &fnl);
     qsort(fnl.files, fnl.count, sizeof(char *), &frt_scmp);
     b = buf = FRT_ALLOC_N(char, fnl.total_len);