isomorfeus-ferret 0.13.4 → 0.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19cfca9e5508c89a931678c23a5b0b32d8759d0d1839ac0ecf0b043d93cd1ddf
-  data.tar.gz: 5999edb4c8ce46718264abdfac47cdd2bcc0f8e0ddf46a0af69bfba1ec024a1c
+  metadata.gz: 1f2a4a6ea097a25d4d32a958c730fffca81ded61133f37ef4c86ca5b78ecef77
+  data.tar.gz: 7be1f98b64559be5f02e39d7a74894476046fef3fdd46d1e69ee3079c74c9681
 SHA512:
-  metadata.gz: e8ab5a9574a3b610b4d554a94ecbdf3252a77d7947f81fdd21bdd0c87ed6bd0940f4842091f0bec793b4e061fe218706d0e16ef64ab19d85ca48d825a1867beb
-  data.tar.gz: 474d0d57a321f3eaf47e372f76c7102592b85c7d0bf2e8506e7e3baf6ad3cbba2b5628296b5a3cf50b9bdba3031a2712225234143343cb9dbf80bc3781d00faa
+  metadata.gz: d173777ee520433e8df0e1a07853f92b65aa350427668baea67a957a28a8cadc05790396d8d5167282c4c83fb1e874eec3316c226e8c961f9f3161f3bf3ecb79
+  data.tar.gz: c64a96813a4b2546e21825cb4a6310c9384a8090bafe51e9c65c49d8c2b8bc69ab3deed82780e6df09089b6a915d6b7e7418bcac30f3d9770c1358800aa2286d

data/ext/isomorfeus_ferret_ext/benchmark.c

@@ -117,13 +117,13 @@ static void bm_single_run(BenchMarkUnit *unit, BenchMarkTimes *bm_times)
     struct rusage ru_before, ru_after;
 
     if (gettimeofday(&tv_before, NULL) == -1)
-        FRT_RAISE(FRT_UNSUPPORTED_ERROR, "gettimeofday failed\n");
+        rb_raise(rb_eRuntimeError, "gettimeofday failed\n");
     getrusage(RUSAGE_SELF, &ru_before);
 
     unit->run();
 
     if (gettimeofday(&tv_after, NULL) == -1)
-        FRT_RAISE(FRT_UNSUPPORTED_ERROR, "gettimeofday failed\n");
+        rb_raise(rb_eRuntimeError, "gettimeofday failed\n");
     getrusage(RUSAGE_SELF, &ru_after);
 
     bm_times->rtime = TVAL_TO_SEC(tv_before, tv_after);

data/ext/isomorfeus_ferret_ext/frb_index.c

@@ -1271,11 +1271,11 @@ void frb_iw_free(void *p) {
 
 void frb_iw_mark(void *p) {
     FrtIndexWriter *iw = (FrtIndexWriter *)p;
-    if (iw->analyzer->ranalyzer)
+    if (iw->analyzer && iw->analyzer->ranalyzer)
         rb_gc_mark(iw->analyzer->ranalyzer);
-    if (iw->store->rstore)
+    if (iw->store && iw->store->rstore)
         rb_gc_mark(iw->store->rstore);
-    if (iw->fis->rfis)
+    if (iw->fis && iw->fis->rfis)
         rb_gc_mark(iw->fis->rfis);
 }
 

data/ext/isomorfeus_ferret_ext/frt_except.c

@@ -19,7 +19,6 @@ const char *const ERROR_TYPES[] = {
     "Lock Error"
 };
 
-bool frt_x_do_logging = false;
 bool frt_x_abort_on_exception = true;
 bool frt_x_has_aborted = false;
 FILE *frt_x_exception_stream = NULL;

data/ext/isomorfeus_ferret_ext/frt_fs_store.c

@@ -418,9 +418,7 @@ static void fs_close_lock_i(FrtLock *lock)
 
 static FrtHash *stores = NULL;
 
-#ifndef UNTHREADED
 static frt_mutex_t stores_mutex = FRT_MUTEX_INITIALIZER;
-#endif
 
 static void fs_close_i(FrtStore *store)
 {

data/ext/isomorfeus_ferret_ext/frt_global.h

@@ -266,13 +266,6 @@ extern FILE *frt_x_exception_stream;
 #define EXCEPTION 2
 #define EXCEPTION_STREAM (frt_x_exception_stream ? frt_x_exception_stream : stderr)
 
-#ifdef DEBUG
-extern bool frt_x_do_logging;
-#define xlog if (frt_x_do_logging) printf
-#else
-#define xlog()
-#endif
-
 extern void frt_init(int arc, const char *const argv[]);
 extern void frt_micro_sleep(const int micro_seconds);
 

data/ext/isomorfeus_ferret_ext/frt_lang.c

@@ -43,7 +43,14 @@ void *frt_erealloc(void *ptr, size_t size)
     return p;
 }
 
-/* void micro_sleep(const int micro_seconds)
+
+struct timeval rb_time_interval _((VALUE));
+
+extern void frt_micro_sleep(const int micro_seconds) {
+    rb_thread_wait_for(rb_time_interval(rb_float_new((double)micro_seconds/1000000.0)));
+}
+
+/* void frt_micro_sleep(const int micro_seconds)
 {
 #if (defined POSH_OS_WIN32 || defined POSH_OS_WIN64) && !defined __MINGW32__
     Sleep(micro_seconds / 1000);

data/ext/isomorfeus_ferret_ext/frt_store.h

@@ -5,7 +5,7 @@
 #include "frt_global.h"
 #include "frt_hash.h"
 #include "frt_hashset.h"
-#include "frb_threading.h"
+#include "frt_threading.h"
 
 #define FRT_LOCK_PREFIX "ferret-"
 #define FRT_LOCK_EXT ".lck"

data/ext/isomorfeus_ferret_ext/isomorfeus_ferret.c

@@ -4,8 +4,8 @@
 #include "frt_except.h"
 #include "frt_hash.h"
 #include "frt_hashset.h"
-#include "frb_threading.h"
-#include "frb_lang.h"
+#include "frt_threading.h"
+#include "ruby.h"
 
 /* IDs */
 ID id_new;

data/ext/isomorfeus_ferret_ext/isomorfeus_ferret.h

@@ -1,10 +1,9 @@
 #ifndef __FERRET_H_
 #define __FERRET_H_
-#include <ruby.h>
 #include "frt_global.h"
 #include "frt_hashset.h"
 #include "frt_document.h"
-#include "frb_lang.h"
+#include <ruby.h>
 
 /* IDs */
 extern ID id_new;

data/ext/isomorfeus_ferret_ext/test_threading.c

@@ -175,7 +175,7 @@ TestSuite *ts_threading(TestSuite *suite)
 
     tst_run_test(suite, test_number_to_str, NULL);
     tst_run_test(suite, test_threading_test, index);
-    // tst_run_test(suite, test_threading, index);
+    tst_run_test(suite, test_threading, index);
 
     frt_index_destroy(index);
 

data/lib/isomorfeus/ferret/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Ferret
-    VERSION = '0.13.4'
+    VERSION = '0.13.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-ferret
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.13.5
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -167,12 +167,9 @@ files:
 - ext/isomorfeus_ferret_ext/fio_tmpfile.h
 - ext/isomorfeus_ferret_ext/frb_analysis.c
 - ext/isomorfeus_ferret_ext/frb_index.c
-- ext/isomorfeus_ferret_ext/frb_lang.c
-- ext/isomorfeus_ferret_ext/frb_lang.h
 - ext/isomorfeus_ferret_ext/frb_qparser.c
 - ext/isomorfeus_ferret_ext/frb_search.c
 - ext/isomorfeus_ferret_ext/frb_store.c
-- ext/isomorfeus_ferret_ext/frb_threading.h
 - ext/isomorfeus_ferret_ext/frb_utils.c
 - ext/isomorfeus_ferret_ext/frt_analysis.c
 - ext/isomorfeus_ferret_ext/frt_analysis.h

data/ext/isomorfeus_ferret_ext/frb_lang.c

@@ -1,9 +0,0 @@
-#include "frt_except.h"
-#include "frb_lang.h"
-
-struct timeval rb_time_interval _((VALUE));
-
-extern void frt_micro_sleep(const int micro_seconds)
-{
-    rb_thread_wait_for(rb_time_interval(rb_float_new((double)micro_seconds/1000000.0)));
-}

data/ext/isomorfeus_ferret_ext/frb_lang.h

@@ -1,17 +0,0 @@
-#ifndef FRT_LANG_H
-#define FRT_LANG_H
-
-#define RUBY_BINDINGS 1
-
-#include <stdarg.h>
-#include <ruby.h>
-
-#undef close
-#undef rename
-#undef read
-
-#define frt_emalloc xmalloc
-#define frt_ecalloc(n) xcalloc(n, 1)
-#define frt_erealloc xrealloc
-
-#endif

data/ext/isomorfeus_ferret_ext/frb_threading.h

@@ -1,29 +0,0 @@
-#ifndef FRT_THREADING_H
-#define FRT_THREADING_H
-
-#include "frt_hash.h"
-#define UNTHREADED 1
-
-typedef void * frt_mutex_t;
-typedef struct FrtHash *frt_thread_key_t;
-typedef int frt_thread_once_t;
-#define FRT_MUTEX_INITIALIZER NULL
-#define FRT_THREAD_ONCE_INIT 1;
-#define frt_mutex_init(a, b)
-#define frt_mutex_lock(a)
-#define frt_mutex_trylock(a)
-#define frt_mutex_unlock(a)
-#define frt_mutex_destroy(a)
-#define frt_thread_key_create(a, b) frb_thread_key_create(a, b)
-#define frt_thread_key_delete(a) frb_thread_key_delete(a)
-#define frt_thread_setspecific(a, b) frb_thread_setspecific(a, b)
-#define frt_thread_getspecific(a) frb_thread_getspecific(a)
-#define frt_thread_once(a, b) frb_thread_once(a, b)
-
-void frb_thread_once(int *once_control, void (*init_routine)(void));
-void frb_thread_key_create(frt_thread_key_t *key, frt_free_ft destroy);
-void frb_thread_key_delete(frt_thread_key_t key);
-void frb_thread_setspecific(frt_thread_key_t key, const void *pointer);
-void *frb_thread_getspecific(frt_thread_key_t key);
-
-#endif