isomorfeus-ferret 0.12.6 → 0.13.1

data/ext/isomorfeus_ferret_ext/frt_store.h

@@ -150,6 +150,7 @@ struct FrtLock
     int (*obtain)(FrtLock *lock);
     int (*is_locked)(FrtLock *lock);
     void (*release)(FrtLock *lock);
+    VALUE rlock;
 };
 
 typedef struct FrtCompoundStore
@@ -320,6 +321,11 @@ struct FrtStore
      * @param store self
      */
     void (*close_i)(FrtStore *store);
+
+    /**
+     * Reference to be used within ruby realm.
+     */
+    VALUE rstore;
 };
 
 /**
@@ -336,7 +342,7 @@ extern FrtStore *frt_open_fs_store(const char *pathname);
  *
  * @return a newly allocated RAM FrtStore.
  */
-extern FrtStore *frt_open_ram_store();
+extern FrtStore *frt_open_ram_store(FrtStore *new_store);
 
 /**
  * Create a newly allocated in-memory or RAM FrtStore. Copy the contents of
@@ -349,7 +355,7 @@ extern FrtStore *frt_open_ram_store();
  * @param close_store close the store whose contents where copied
  * @return a newly allocated RAM FrtStore.
  */
-extern FrtStore *frt_open_ram_store_and_copy(FrtStore *store, bool close_store);
+extern FrtStore *frt_open_ram_store_and_copy(FrtStore *store, FrtStore *from_store, bool close_store);
 
 /**
  * Open a compound store. This is basically store which is stored within a
@@ -779,6 +785,8 @@ extern void frt_close_lock(FrtLock *lock);
 
 /* required by submodules
  * FIXME document. Perhaps include in different header?? */
+extern FrtStore *frt_store_alloc();
+extern FrtStore *frt_store_init(FrtStore *store);
 extern FrtStore *frt_store_new();
 extern void frt_store_destroy(FrtStore *store);
 extern FrtOutStream *frt_os_new();

data/ext/isomorfeus_ferret_ext/frt_threading.h

@@ -17,7 +17,6 @@ typedef pthread_once_t frt_thread_once_t;
 #define frt_thread_key_delete(a) pthread_key_delete(a)
 #define frt_thread_setspecific(a, b) pthread_setspecific(a, b)
 #define frt_thread_getspecific(a) pthread_getspecific(a)
-#define frt_thread_exit(a) pthread_exit(a)
 #define frt_thread_once(a, b) pthread_once(a, b)
 
 #endif

data/ext/isomorfeus_ferret_ext/isomorfeus_ferret.c

@@ -7,10 +7,6 @@
 #include "frb_threading.h"
 #include "frb_lang.h"
 
-
-/* Object Map */
-static FrtHash *object_map;
-
 /* IDs */
 ID id_new;
 ID id_call;
@@ -50,104 +46,44 @@ VALUE cStateError;
 void Init_Benchmark(void);
 void Init_Test(void);
 
-unsigned long long value_hash(const void *key)
-{
+unsigned long long value_hash(const void *key) {
     return (unsigned long long)key;
 }
 
-int value_eq(const void *key1, const void *key2)
-{
+int value_eq(const void *key1, const void *key2) {
     return key1 == key2;
 }
 
-VALUE object_get(void *key)
-{
-    VALUE val = (VALUE)frt_h_get(object_map, key);
-    if (!val) val = Qnil;
-    return val;
-}
-
-//static int hash_cnt = 0;
-void
-//object_add(void *key, VALUE obj)
-object_add2(void *key, VALUE obj, const char *file, int line)
-{
-    if (frt_h_get(object_map, key))
-        printf("failed adding %lx to %lld; already contains %llx. %s:%d\n",
-               (long)obj, (long long)key, (long long)frt_h_get(object_map, key), file, line);
-    frt_h_set(object_map, key, (void *)obj);
-}
-
-void
-//object_set(void *key, VALUE obj)
-object_set2(void *key, VALUE obj, const char *file, int line)
-{
-    frt_h_set(object_map, key, (void *)obj);
-}
-
-void
-//object_del(void *key)
-object_del2(void *key, const char *file, int line)
-{
-    if (object_get(key) == Qnil)
-        printf("failed deleting %lld. %s:%d\n", (long long)key, file, line);
-    frt_h_del(object_map, key);
-}
-
-void frb_gc_mark(void *key)
-{
-    VALUE val = (VALUE)frt_h_get(object_map, key);
-    if (val)
-        rb_gc_mark(val);
-}
-
-VALUE frb_data_alloc(VALUE klass)
-{
-    return Frt_Make_Struct(klass);
-}
-
-void frb_deref_free(void *p)
-{
-    object_del(p);
-}
-
-void frb_thread_once(int *once_control, void (*init_routine) (void))
-{
+void frb_thread_once(int *once_control, void (*init_routine) (void)) {
     if (*once_control) {
         init_routine();
         *once_control = 0;
     }
 }
 
-void frb_thread_key_create(frt_thread_key_t *key, void (*destr_function)(void *))
-{
+void frb_thread_key_create(frt_thread_key_t *key, void (*destr_function)(void *)) {
     *key = frt_h_new(&value_hash, &value_eq, NULL, destr_function);
 }
 
-void frb_thread_key_delete(frt_thread_key_t key)
-{
+void frb_thread_key_delete(frt_thread_key_t key) {
     frt_h_destroy(key);
 }
 
-void frb_thread_setspecific(frt_thread_key_t key, const void *pointer)
-{
+void frb_thread_setspecific(frt_thread_key_t key, const void *pointer) {
     frt_h_set(key, (void *)rb_thread_current(), (void *)pointer);
 }
 
-void *frb_thread_getspecific(frt_thread_key_t key)
-{
+void *frb_thread_getspecific(frt_thread_key_t key) {
     return frt_h_get(key, (void *)rb_thread_current());
 }
 
-void frb_create_dir(VALUE rpath)
-{
+void frb_create_dir(VALUE rpath) {
     VALUE mFileUtils;
     mFileUtils = rb_define_module("FileUtils");
     rb_funcall(mFileUtils, id_mkdir_p, 1, rpath);
 }
 
-VALUE frb_hs_to_rb_ary(FrtHashSet *hs)
-{
+VALUE frb_hs_to_rb_ary(FrtHashSet *hs) {
     FrtHashSetEntry *hse;
     VALUE ary = rb_ary_new();
 
@@ -157,31 +93,21 @@ VALUE frb_hs_to_rb_ary(FrtHashSet *hs)
     return ary;
 }
 
-void *frb_rb_data_ptr(VALUE val)
-{
+void *frb_rb_data_ptr(VALUE val) {
     Check_Type(val, T_DATA);
     return DATA_PTR(val);
 }
 
-char *
-rs2s(VALUE rstr)
-{
+char *rs2s(VALUE rstr) {
     return (char *)(RSTRING_PTR(rstr) ? RSTRING_PTR(rstr) : FRT_EMPTY_STRING);
 }
 
-char *
-rstrdup(VALUE rstr)
-{
+char *rstrdup(VALUE rstr) {
     char *old = rs2s(rstr);
-    //int len = RSTRING_LEN(rstr);
-    //char *new = FRT_ALLOC_N(char, len + 1);
-    //memcpy(new, old, len);
     return frt_estrdup(old);
 }
 
-FrtSymbol
-frb_field(VALUE rfield)
-{
+ID frb_field(VALUE rfield) {
     switch (TYPE(rfield)) {
         case T_SYMBOL:
             return rb_to_id(rfield);
@@ -200,9 +126,7 @@ frb_field(VALUE rfield)
  * Jeremie 'ahFeel' BORDIER
  * ahFeel@rift.Fr
  */
-char *
-json_concat_string(char *s, char *field)
-{
+char *json_concat_string(char *s, char *field) {
     *(s++) = '"';
 	while (*field) {
 		if (*field == '"') {
@@ -220,8 +144,7 @@ json_concat_string(char *s, char *field)
 
 static VALUE error_map;
 
-VALUE frb_get_error(const char *err_type)
-{
+VALUE frb_get_error(const char *err_type) {
     VALUE error_class;
     if (Qnil != (error_class = rb_hash_aref(error_map, rb_intern(err_type)))) {
         return error_class;
@@ -283,16 +206,11 @@ void FRT_EXIT(const char *err_type, const char *fmt, ...)
 static ID id_field;
 static ID id_text;
 
-VALUE frb_get_term(FrtSymbol field, const char *text)
-{
-    return rb_struct_new(cTerm,
-                         ID2SYM(field),
-                         rb_str_new_cstr(text),
-                         NULL);
+VALUE frb_get_term(ID field, const char *text) {
+    return rb_struct_new(cTerm, ID2SYM(field), rb_str_new_cstr(text), NULL);
 }
 
-static VALUE frb_term_to_s(VALUE self)
-{
+static VALUE frb_term_to_s(VALUE self) {
     VALUE rstr;
     VALUE rfield = rb_funcall(self, id_field, 0);
     VALUE rtext = rb_funcall(self, id_text, 0);
@@ -311,8 +229,7 @@ static VALUE frb_term_to_s(VALUE self)
  *
  *  A Term holds a term from a document and its field name (as a Symbol).
  */
-void Init_Term(void)
-{
+void Init_Term(void) {
     const char *term_class = "Term";
     cTerm = rb_struct_define(term_class, "field", "text", NULL);
     rb_set_class_path(cTerm, mFerret, term_class);
@@ -327,20 +244,13 @@ void Init_Term(void)
  *
  *  See the README
  */
-void Init_Ferret(void)
-{
+void Init_Ferret(void) {
     Init_Term();
     rb_require("fileutils");
 }
 
-void Init_isomorfeus_ferret_ext(void)
-{
-    const char *const progname[] = {"ruby"};
-
-    frt_init(1, progname);
-
-    /* initialize object map */
-    object_map = frt_h_new(&value_hash, &value_eq, NULL, NULL);
+void Init_isomorfeus_ferret_ext(void) {
+    frt_init(0, NULL);
 
     /* IDs */
     id_new = rb_intern("new");

data/ext/isomorfeus_ferret_ext/isomorfeus_ferret.h

@@ -50,45 +50,15 @@ extern void Init_Search();
 extern void Init_QueryParser();
 
 extern void frb_raise(int excode, const char *msg);
-//extern void object_add(void *key, VALUE obj);
-#define object_add(key, obj) object_add2(key, obj,  __FILE__, __LINE__)
-extern void object_add2(void *key, VALUE obj, const char *file, int line);
-//extern void object_set(void *key, VALUE obj);
-#define object_set(key, obj) object_set2(key, obj,  __FILE__, __LINE__)
-extern void object_set2(void *key, VALUE obj, const char *file, int line);
-//extern void object_del(void *key);
-#define object_del(key) object_del2(key,  __FILE__, __LINE__)
-extern void object_del2(void *key, const char *file, int line);
-extern void frb_gc_mark(void *key);
-extern VALUE object_get(void *key);
-extern VALUE frb_data_alloc(VALUE klass);
-extern void frb_deref_free(void *p);
 extern void frb_create_dir(VALUE rpath);
 extern VALUE frb_hs_to_rb_ary(FrtHashSet *hs);
 extern void *frb_rb_data_ptr(VALUE val);
-extern FrtSymbol frb_field(VALUE rfield);
-extern VALUE frb_get_term(FrtSymbol field, const char *term);
+extern ID frb_field(VALUE rfield);
+extern VALUE frb_get_term(ID field, const char *term);
 extern char *json_concat_string(char *s, char *field);
 extern char *rs2s(VALUE rstr);
 extern char *rstrdup(VALUE rstr);
 
-#define Frt_Make_Struct(klass)\
-  rb_data_object_wrap(klass,NULL,(RUBY_DATA_FUNC)NULL,(RUBY_DATA_FUNC)NULL)
-
-#define Frt_Wrap_Struct(self,mmark,mfree,mdata)\
-  do {\
-    ((struct RData *)(self))->data = mdata;\
-    ((struct RData *)(self))->dmark = (RUBY_DATA_FUNC)mmark;\
-    ((struct RData *)(self))->dfree = (RUBY_DATA_FUNC)mfree;\
-  } while (0)
-
-#define Frt_Unwrap_Struct(self)\
-  do {\
-    ((struct RData *)(self))->data = NULL;\
-    ((struct RData *)(self))->dmark = NULL;\
-    ((struct RData *)(self))->dfree = NULL;\
-  } while (0)
-
 #endif
 
 #define frb_mark_cclass(klass) rb_ivar_set(klass, id_cclass, Qtrue)