isomorfeus-ferret 0.17.2 → 0.17.3

data/ext/isomorfeus_ferret_ext/mdbx.h

@@ -77,10 +77,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #if defined(__riscv) || defined(__riscv__) || defined(__RISCV) ||              \
     defined(__RISCV__)
-#warning The RISC-V architecture is intentionally insecure by design. \
+#warning "The RISC-V architecture is intentionally insecure by design. \
   Please delete this admonition at your own risk, \
   if you make such decision informed and consciously. \
-  Refer to https://clck.ru/32d9xH for more information.
+  Refer to https://clck.ru/32d9xH for more information."
 #endif /* RISC-V */
 
 #ifdef _MSC_VER
@@ -1926,6 +1926,15 @@ enum MDBX_error_t {
   /** Overlapping read and write transactions for the current thread */
   MDBX_TXN_OVERLAPPING = -30415,
 
+  /** Internal error returned in case of insufficient free pages
+   * during GC update. Used as a debugging aid.
+   * \note From the user's point of view, semantically
+   *       is equivalent to \ref MDBX_PROBLEM. */
+  MDBX_BACKLOG_DEPLETED = -30414,
+
+  /** Alternative/Duplicate LCK-file is exists and should be removed manually */
+  MDBX_DUPLICATED_CLK = -30413,
+
   /* The last of MDBX-added error codes */
   MDBX_LAST_ADDED_ERRCODE = MDBX_TXN_OVERLAPPING,
 
@@ -2220,6 +2229,39 @@ enum MDBX_option_t {
    * to 50% (half empty) which corresponds to the range from 8192 and to 32768
    * in units respectively. */
   MDBX_opt_merge_threshold_16dot16_percent,
+
+  /** \brief Controls the choosing between use write-through disk writes and
+   * usual ones with followed flush by the `fdatasync()` syscall.
+   * \details Depending on the operating system, storage subsystem
+   * characteristics and the use case, higher performance can be achieved by
+   * either using write-through or a serie of usual/lazy writes followed by
+   * the flush-to-disk.
+   *
+   * Basically for N chunks the latency/cost of write-through is:
+   *  latency = N * (emit + round-trip-to-storage + storage-execution);
+   * And for serie of lazy writes with flush is:
+   *  latency = N * (emit + storage-execution) + flush + round-trip-to-storage.
+   *
+   * So, for large N and/or noteable round-trip-to-storage the write+flush
+   * approach is win. But for small N and/or near-zero NVMe-like latency
+   * the write-through is better.
+   *
+   * To solve this issue libmdbx provide `MDBX_opt_writethrough_threshold`:
+   *  - when N described above less or equal specified threshold,
+   *    a write-through approach will be used;
+   *  - otherwise, when N great than specified threshold,
+   *    a write-and-flush approach will be used.
+   *
+   * \note MDBX_opt_writethrough_threshold affects only \ref MDBX_SYNC_DURABLE
+   * mode without \ref MDBX_WRITEMAP, and not supported on Windows.
+   * On Windows a write-through is used always but \ref MDBX_NOMETASYNC could
+   * be used for switching to write-and-flush. */
+  MDBX_opt_writethrough_threshold,
+
+  /** \brief Controls prevention of page-faults of reclaimed and allocated pages
+   * in the \ref MDBX_WRITEMAP mode by clearing ones through file handle before
+   * touching. */
+  MDBX_opt_prefault_write_enable,
 };
 #ifndef __cplusplus
 /** \ingroup c_settings */
@@ -2555,16 +2597,18 @@ struct MDBX_envinfo {
    * first process opened the database after everyone had previously closed it).
    */
   struct {
-    uint64_t newly;   /**< Quantity of a new pages added */
-    uint64_t cow;     /**< Quantity of pages copied for update */
-    uint64_t clone;   /**< Quantity of parent's dirty pages clones
-                           for nested transactions */
-    uint64_t split;   /**< Page splits */
-    uint64_t merge;   /**< Page merges */
-    uint64_t spill;   /**< Quantity of spilled dirty pages */
-    uint64_t unspill; /**< Quantity of unspilled/reloaded pages */
-    uint64_t wops;    /**< Number of explicit write operations (not a pages)
-                           to a disk */
+    uint64_t newly;    /**< Quantity of a new pages added */
+    uint64_t cow;      /**< Quantity of pages copied for update */
+    uint64_t clone;    /**< Quantity of parent's dirty pages clones
+                            for nested transactions */
+    uint64_t split;    /**< Page splits */
+    uint64_t merge;    /**< Page merges */
+    uint64_t spill;    /**< Quantity of spilled dirty pages */
+    uint64_t unspill;  /**< Quantity of unspilled/reloaded pages */
+    uint64_t wops;     /**< Number of explicit write operations (not a pages)
+                            to a disk */
+    uint64_t prefault; /**< Number of prefault write operations (not a pages) */
+    uint64_t mincore;  /**< Number of mincore() calls */
     uint64_t
         msync; /**< Number of explicit msync-to-disk operations (not a pages) */
     uint64_t
@@ -3735,75 +3779,69 @@ struct MDBX_commit_latency {
   /** \brief User-mode CPU time spent on GC update. */
   uint32_t gc_cputime;
 
-  /** \brief Информация для профилирования работы GC.
-   * \note Статистика является общей для всех процессов работающих с одним
-   * файлом БД и хранится в LCK-файле. Данные аккумулируются при фиксации всех
-   * транзакций, но только в сборках libmdbx c установленной опцией
-   * \ref MDBX_ENABLE_PROFGC. Собранная статистика возвращаются любому процессу
-   * при использовании \ref mdbx_txn_commit_ex() и одновременно обнуляется
-   * при завершении транзакций верхнего уровня (не вложенных). */
+  /** \brief Information for profiling GC performance.
+   * \note Statistics is common for all processes working with one
+   * database file and is stored in the LCK file. Data is accumulated when fixing all
+   * transactions, but only in libmdbx builds with the option set
+   * \ref MDBX_ENABLE_PROFGC. Collected statistics are returned to any process
+   * when using \ref mdbx_txn_commit_ex() and reset to zero at the same time
+   * when completing top-level transactions (not nested). */
   struct {
-    /** \brief Количество итераций обновления GC,
-     *  больше 1 если были повторы/перезапуски. */
+    /** \brief Number of GC update iterations,
+     *  more than 1 if there were repetitions/restarts. */
     uint32_t wloops;
-    /** \brief Количество итераций слияния записей GC. */
+    /** \brief Number of iterations to merge GC records. */
     uint32_t coalescences;
-    /** \brief Количество уничтожений предыдущих надежных/устойчивых
-     *  точек фиксации при работе в режиме \ref MDBX_UTTERLY_NOSYNC. */
+    /** \brief Number of previous reliable/sustainable kills
+     *  fixation points when working in the mode \ref MDBX_UTTERLY_NOSYNC. */
     uint32_t wipes;
-    /** \brief Количество принудительных фиксаций на диск
-     *  во избежания приращения БД при работе вне режима
+    /** \brief Number of forced commits per disk
+     *  in order to avoid incrementing the database when working outside the mode
      *  \ref MDBX_UTTERLY_NOSYNC. */
     uint32_t flushes;
-    /** \brief Количество обращений к механизму Handle-Slow-Readers
-     *  во избежания приращения БД.
+    /** \brief Number of calls to the mechanism Handle-Slow-Readers
+     *  to avoid database increment.
      *  \see MDBX_hsr_func */
     uint32_t kicks;
 
-    /** \brief Счетчик выполнения по медленному пути (slow path execution count)
-     *  GC ради данных пользователя. */
+    /** \brief Slow path execution counter
+     *  GC for user data. */
     uint32_t work_counter;
-    /** \brief Время "по настенным часам" затраченное на чтение и поиск внутри
-     *  GC ради данных пользователя. */
+    /** \brief The "by wall clock" time spent reading and searching within
+     *  GC for user data. */
     uint32_t work_rtime_monotonic;
-    /** \brief Монотонное время по "настенным часам" затраченное
-     *   на подготовку страниц извлекаемых из GC для данных пользователя,
-     *   включая подкачку с диска. */
-    uint32_t work_xtime_monotonic;
-    /** \brief Время ЦПУ в режиме пользователе затраченное на чтение и поиск
-     *  внтури GC ради данных пользователя. */
-    uint32_t work_rtime_cpu;
-    /** \brief Количество итераций поиска внутри GC при выделении страниц
-     *  ради данных пользователя. */
+    /** \brief CPU time in user mode spent
+     * to prepare pages retrieved from GC for user data,
+     * including paging from disk. */
+    uint32_t work_xtime_cpu;
+    /** \brief Number of search iterations within the GC when selecting pages
+     * For the sake of user data. */
     uint32_t work_rsteps;
-    /** \brief Количество запросов на выделение последовательностей страниц
-     *  ради данных пользователя. */
+    /** \brief Number of queries to allocate page sequences
+     * For the sake of user data. */
     uint32_t work_xpages;
-    /** \brief Количество страничных промахов (page faults) внутри GC
-     *  при выделении и подготовки страниц для данных пользователя. */
+    /** \brief Number of page faults within GC.
+     * when selecting and preparing pages for user data. */
     uint32_t work_majflt;
 
-    /** \brief Счетчик выполнения по медленному пути (slow path execution count)
-     *  GC для целей поддержки и обновления самой GC. */
+    /** \brief Slow path execution count
+     * GC for the purpose of maintaining and updating the GC itself. */
     uint32_t self_counter;
-    /** \brief Время "по настенным часам" затраченное на чтение и поиск внутри
-     *  GC для целей поддержки и обновления самой GC. */
+    /** \brief The "by wall clock" time spent reading and searching inside
+     * GC for the purpose of maintaining and updating the GC itself. */
     uint32_t self_rtime_monotonic;
-    /** \brief Монотонное время по "настенным часам" затраченное на подготовку
-     *  страниц извлекаемых из GC для целей поддержки и обновления самой GC,
-     *  включая подкачку с диска. */
-    uint32_t self_xtime_monotonic;
-    /** \brief Время ЦПУ в режиме пользователе затраченное на чтение и поиск
-     *  внтури GC для целей поддержки и обновления самой GC. */
-    uint32_t self_rtime_cpu;
-    /** \brief Количество итераций поиска внутри GC при выделении страниц
-     *  для целей поддержки и обновления самой GC. */
+    /** \brief CPU time in user mode spent on preparing
+     * pages retrieved from GC for the purpose of maintaining and updating GC itself,
+     * including paging from disk. */
+    uint32_t self_xtime_cpu;
+    /** \brief Number of search iterations within the GC when highlighting pages
+     * for the purpose of maintaining and updating the GC itself. */
     uint32_t self_rsteps;
-    /** \brief Количество запросов на выделение последовательностей страниц
-     *  для самой GC. */
+    /** \brief Number of requests for page sequences allocation
+     * for GC itself. */
     uint32_t self_xpages;
-    /** \brief Количество страничных промахов (page faults) внутри GC
-     *  при выделении и подготовки страниц для самой GC. */
+    /** \brief Number of page faults inside the GC.
+     * when selecting and preparing pages for the GC itself. */
     uint32_t self_majflt;
   } gc_prof;
 };
@@ -4128,6 +4166,8 @@ typedef int(MDBX_cmp_func)(const MDBX_val *a,
  *                               by current thread. */
 LIBMDBX_API int mdbx_dbi_open(MDBX_txn *txn, const char *name,
                               MDBX_db_flags_t flags, MDBX_dbi *dbi);
+LIBMDBX_API int mdbx_dbi_open2(MDBX_txn *txn, const MDBX_val *name,
+                               MDBX_db_flags_t flags, MDBX_dbi *dbi);
 
 /** \deprecated Please
  * \ref avoid_custom_comparators "avoid using custom comparators" and use
@@ -4147,6 +4187,9 @@ LIBMDBX_API int mdbx_dbi_open(MDBX_txn *txn, const char *name,
 MDBX_DEPRECATED LIBMDBX_API int
 mdbx_dbi_open_ex(MDBX_txn *txn, const char *name, MDBX_db_flags_t flags,
                  MDBX_dbi *dbi, MDBX_cmp_func *keycmp, MDBX_cmp_func *datacmp);
+MDBX_DEPRECATED LIBMDBX_API int
+mdbx_dbi_open_ex2(MDBX_txn *txn, const MDBX_val *name, MDBX_db_flags_t flags,
+                  MDBX_dbi *dbi, MDBX_cmp_func *keycmp, MDBX_cmp_func *datacmp);
 
 /** \defgroup value2key Value-to-Key functions
  * \brief Value-to-Key functions to
@@ -5444,18 +5487,20 @@ typedef enum MDBX_page_type_t MDBX_page_type_t;
 #endif
 
 /** \brief Pseudo-name for MainDB */
-#define MDBX_PGWALK_MAIN ((const char *)((ptrdiff_t)0))
+#define MDBX_PGWALK_MAIN ((void *)((ptrdiff_t)0))
 /** \brief Pseudo-name for GarbageCollectorDB */
-#define MDBX_PGWALK_GC ((const char *)((ptrdiff_t)-1))
+#define MDBX_PGWALK_GC ((void *)((ptrdiff_t)-1))
 /** \brief Pseudo-name for MetaPages */
-#define MDBX_PGWALK_META ((const char *)((ptrdiff_t)-2))
+#define MDBX_PGWALK_META ((void *)((ptrdiff_t)-2))
 
 /** \brief Callback function for traverse the b-tree. \see mdbx_env_pgwalk() */
-typedef int MDBX_pgvisitor_func(
-    const uint64_t pgno, const unsigned number, void *const ctx, const int deep,
-    const char *const dbi, const size_t page_size, const MDBX_page_type_t type,
-    const MDBX_error_t err, const size_t nentries, const size_t payload_bytes,
-    const size_t header_bytes, const size_t unused_bytes) MDBX_CXX17_NOEXCEPT;
+typedef int
+MDBX_pgvisitor_func(const uint64_t pgno, const unsigned number, void *const ctx,
+                    const int deep, const MDBX_val *dbi_name,
+                    const size_t page_size, const MDBX_page_type_t type,
+                    const MDBX_error_t err, const size_t nentries,
+                    const size_t payload_bytes, const size_t header_bytes,
+                    const size_t unused_bytes) MDBX_CXX17_NOEXCEPT;
 
 /** \brief B-tree traversal function. */
 LIBMDBX_API int mdbx_env_pgwalk(MDBX_txn *txn, MDBX_pgvisitor_func *visitor,

data/ext/isomorfeus_ferret_ext/test.c

@@ -45,8 +45,7 @@ static char *msg_buf;
 static char *msg_bufp;
 
 /* Determine if the test should be run at all */
-static bool should_test_run(const char *testname)
-{
+static bool should_test_run(const char *testname) {
     if (list_tests == true) {
         /* when listing tests, don't run any of them */
         return false;
@@ -60,16 +59,14 @@ static void reset_stats(void) {
     f_cnt = 0;
 }
 
-static void reset_status(void)
-{
+static void reset_status(void) {
     curr_char = 0;
 }
 
 /* Basically this just deletes the previous character and replaces it with the
  * next character in the ticker array. If the tests run slowly enough it will
  * look like a spinning bar. */
-static void update_status(void)
-{
+static void update_status(void) {
     if (!quiet) {
         curr_char = (curr_char + 1) % TST_STAT_SIZE;
         fprintf(stdout, "\b%c", status[curr_char]);
@@ -81,8 +78,7 @@ static void update_status(void)
 /*
  * Ends the test suite by writing SUCCESS or FAILED at the end of the test
  * results in the diagnostics. */
-static void end_suite(TestSuite *suite)
-{
+static void end_suite(TestSuite *suite) {
     if (suite != NULL) {
         TestSubSuite *last = suite->tail;
         if (!quiet) {
@@ -92,8 +88,7 @@ static void end_suite(TestSuite *suite)
         if (last->failed == 0) {
             fprintf(stdout, " -> SUCCESS\n");
             fflush(stdout);
-        }
-        else {
+        } else {
             fprintf(stdout, " -> FAILED %d of %d\n", last->failed,
                     last->num_test);
             fflush(stdout);
@@ -101,8 +96,7 @@ static void end_suite(TestSuite *suite)
     }
 }
 
-TestSuite *tst_add_suite(TestSuite *suite, const char *suite_name_full)
-{
+TestSuite *tst_add_suite(TestSuite *suite, const char *suite_name_full) {
     TestSubSuite *subsuite;
     char *p;
     const char *suite_name;
@@ -127,8 +121,7 @@ TestSuite *tst_add_suite(TestSuite *suite, const char *suite_name_full)
     suite_name = strrchr(suite_name_full, '/');
     if (suite_name) {
         suite_name++;
-    }
-    else {
+    } else {
         suite_name = suite_name_full;
     }
     /* strip extension */
@@ -153,8 +146,7 @@ TestSuite *tst_add_suite(TestSuite *suite, const char *suite_name_full)
         suite = (TestSuite *)malloc(sizeof(*suite));
         suite->head = subsuite;
         suite->tail = subsuite;
-    }
-    else {
+    } else {
         /* Add the current suite to the tail of the suite linked list */
         suite->tail->next = subsuite;
         suite->tail = subsuite;
@@ -174,8 +166,7 @@ TestSuite *tst_add_suite(TestSuite *suite, const char *suite_name_full)
     return suite;
 }
 
-void tst_run_test_with_name(TestSuite *ts, test_func f, void *value, const char *func_name)
-{
+void tst_run_test_with_name(TestSuite *ts, test_func f, void *value, const char *func_name) {
     TestCase tc;
     TestSubSuite *ss;
 
@@ -199,24 +190,20 @@ void tst_run_test_with_name(TestSuite *ts, test_func f, void *value, const char
         ss->failed++;
         if (quiet) {
           printf("F");
-        }
-        else {
+        } else {
           printf("\bF_");
         }
-    }
-    else {
+    } else {
         if (quiet) {
           printf(".");
-        }
-        else {
+        } else {
           printf("\b._");
         }
     }
     update_status();
 }
 
-static int report(TestSuite *suite)
-{
+static int report(TestSuite *suite) {
     int count = 0;
     TestSubSuite *dptr;
 
@@ -260,8 +247,7 @@ static int report(TestSuite *suite)
 static const char *curr_err_func = "";
 
 #define MSG_BUF_HAVE MAX_MSG_SIZE - (msg_bufp - msg_buf) - 1
-static void vappend_to_msg_buf(const char *fmt, va_list args)
-{
+static void vappend_to_msg_buf(const char *fmt, va_list args) {
     int v = vsnprintf(msg_bufp, MSG_BUF_HAVE, fmt, args);
     if (v < 0) {
         rb_raise(rb_eStandardError, "Error: can't write to test message buffer\n");
@@ -270,8 +256,7 @@ static void vappend_to_msg_buf(const char *fmt, va_list args)
     }
 }
 
-static void append_to_msg_buf(const char *fmt, ...)
-{
+static void append_to_msg_buf(const char *fmt, ...) {
     va_list args;
 
     va_start(args, fmt);
@@ -279,15 +264,13 @@ static void append_to_msg_buf(const char *fmt, ...)
     va_end(args);
 }
 
-static void vTmsg_nf(const char *fmt, va_list args)
-{
+static void vTmsg_nf(const char *fmt, va_list args) {
     if (verbose) {
         vappend_to_msg_buf(fmt, args);
     }
 }
 
-void vTmsg(const char *fmt, va_list args)
-{
+void vTmsg(const char *fmt, va_list args) {
     if (verbose) {
         append_to_msg_buf("\t");
         vappend_to_msg_buf(fmt, args);
@@ -296,8 +279,7 @@ void vTmsg(const char *fmt, va_list args)
     }
 }
 
-void Tmsg(const char *fmt, ...)
-{
+void Tmsg(const char *fmt, ...) {
     va_list args;
 
     va_start(args, fmt);
@@ -305,8 +287,7 @@ void Tmsg(const char *fmt, ...)
     va_end(args);
 }
 
-void Tmsg_nf(const char *fmt, ...)
-{
+void Tmsg_nf(const char *fmt, ...) {
     va_list args;
 
     va_start(args, fmt);
@@ -314,8 +295,7 @@ void Tmsg_nf(const char *fmt, ...)
     va_end(args);
 }
 
-void tst_msg(const char *func, const char *fname, int line_num, const char *fmt, ...)
-{
+void tst_msg(const char *func, const char *fname, int line_num, const char *fmt, ...) {
     int i;
     va_list args;
 
@@ -338,8 +318,7 @@ void tst_msg(const char *func, const char *fname, int line_num, const char *fmt,
 }
 
 bool tst_raise(int line_num, TestCase *tc, const int err_code,
-               void (*func)(void *args), void *args)
-{
+               void (*func)(void *args), void *args) {
     volatile bool was_raised = false;
     a_cnt++;
     update_status();
@@ -353,8 +332,7 @@ bool tst_raise(int line_num, TestCase *tc, const int err_code,
     default:
         if (err_code == xcontext.excode) {
             was_raised = true;
-        }
-        else {
+        } else {
             tc->failed = true;
             tst_msg(tc->name, tc->suite->name, line_num,
                 "exception %d raised unexpectedly with msg;\n\"\"\"\n%s\n\"\"\"\n",
@@ -371,16 +349,14 @@ bool tst_raise(int line_num, TestCase *tc, const int err_code,
     }
     if (tc->failed) {
         return false;
-    }
-    else {
+    } else {
         return true;
     }
 }
 
 #define I64_PFX POSH_I64_PRINTF_PREFIX
 bool tst_int_equal(int line_num, TestCase *tc, const frt_u64 expected,
-                   const frt_u64 actual)
-{
+                   const frt_u64 actual) {
     a_cnt++;
     update_status();
     if (tc->failed && !force) {
@@ -399,8 +375,7 @@ bool tst_int_equal(int line_num, TestCase *tc, const frt_u64 expected,
 }
 
 bool tst_flt_delta_equal(int line_num, TestCase *tc, const double expected,
-                         const double actual, const double delta)
-{
+                         const double actual, const double delta) {
     double diff;
     a_cnt++;
     update_status();
@@ -426,14 +401,12 @@ bool tst_flt_delta_equal(int line_num, TestCase *tc, const double expected,
 }
 
 bool tst_flt_equal(int line_num, TestCase *tc, const double expected,
-                   const double actual)
-{
+                   const double actual) {
     return tst_flt_delta_equal(line_num, tc, expected, actual, 0.00001);
 }
 
 bool tst_str_equal(int line_num, TestCase *tc, const char *expected,
-                   const char *actual)
-{
+                   const char *actual) {
     a_cnt++;
     update_status();
     if (tc->failed && !force) {
@@ -454,8 +427,7 @@ bool tst_str_equal(int line_num, TestCase *tc, const char *expected,
 }
 
 bool tst_strstr(int line_num, TestCase *tc, const char *haystack,
-                   const char *needle)
-{
+                   const char *needle) {
     a_cnt++;
     update_status();
     if (tc->failed && !force) {
@@ -476,8 +448,7 @@ bool tst_strstr(int line_num, TestCase *tc, const char *haystack,
 }
 
 bool tst_arr_int_equal(int line_num, TestCase *tc, const int *expected,
-                       const int *actual, int size)
-{
+                       const int *actual, int size) {
     a_cnt++;
     update_status();
     if (tc->failed && !force) {
@@ -503,8 +474,7 @@ bool tst_arr_int_equal(int line_num, TestCase *tc, const int *expected,
 }
 
 bool tst_arr_str_equal(int line_num, TestCase *tc, const char **expected,
-                       const char **actual, int size)
-{
+                       const char **actual, int size) {
     a_cnt++;
     update_status();
     if (tc->failed && !force) {
@@ -530,8 +500,7 @@ bool tst_arr_str_equal(int line_num, TestCase *tc, const char **expected,
 }
 
 bool tst_str_nequal(int line_num, TestCase *tc, const char *expected,
-                    const char *actual, size_t n)
-{
+                    const char *actual, size_t n) {
     char *buf1;
     char *buf2;
 
@@ -557,8 +526,7 @@ bool tst_str_nequal(int line_num, TestCase *tc, const char *expected,
     return false;
 }
 
-bool tst_ptr_null(int line_num, TestCase *tc, const void *ptr)
-{
+bool tst_ptr_null(int line_num, TestCase *tc, const void *ptr) {
     a_cnt++;
     update_status();
     if (tc->failed && !force) {
@@ -574,8 +542,7 @@ bool tst_ptr_null(int line_num, TestCase *tc, const void *ptr)
     return false;
 }
 
-bool tst_ptr_notnull(int line_num, TestCase *tc, const void *ptr)
-{
+bool tst_ptr_notnull(int line_num, TestCase *tc, const void *ptr) {
     a_cnt++;
     update_status();
     if (tc->failed && !force) {
@@ -592,8 +559,7 @@ bool tst_ptr_notnull(int line_num, TestCase *tc, const void *ptr)
 }
 
 bool tst_ptr_equal(int line_num, TestCase *tc, const void *expected,
-                   const void *actual)
-{
+                   const void *actual) {
     a_cnt++;
     update_status();
     if (tc->failed && !force) {
@@ -610,8 +576,7 @@ bool tst_ptr_equal(int line_num, TestCase *tc, const void *expected,
     return false;
 }
 
-bool tst_fail(int line_num, TestCase *tc, const char *fmt, ...)
-{
+bool tst_fail(int line_num, TestCase *tc, const char *fmt, ...) {
     va_list args;
     a_cnt++;
     update_status();
@@ -626,8 +591,7 @@ bool tst_fail(int line_num, TestCase *tc, const char *fmt, ...)
     return false;
 }
 
-bool tst_assert(int line_num, TestCase *tc, int condition, const char *fmt, ...)
-{
+bool tst_assert(int line_num, TestCase *tc, int condition, const char *fmt, ...) {
     va_list args;
     a_cnt++;
     update_status();
@@ -647,8 +611,7 @@ bool tst_assert(int line_num, TestCase *tc, int condition, const char *fmt, ...)
     return false;
 }
 
-bool tst_true(int line_num, TestCase *tc, int condition)
-{
+bool tst_true(int line_num, TestCase *tc, int condition) {
     a_cnt++;
     update_status();
     if (tc->failed && !force) {
@@ -666,8 +629,7 @@ bool tst_true(int line_num, TestCase *tc, int condition)
     return false;
 }
 
-bool tst_not_impl(int line_num, TestCase *tc, const char *message)
-{
+bool tst_not_impl(int line_num, TestCase *tc, const char *message) {
     a_cnt++;
     update_status();
 
@@ -677,12 +639,10 @@ bool tst_not_impl(int line_num, TestCase *tc, const char *message)
 }
 
 #ifndef FRT_HAS_VARARGS
-bool Assert(int condition, const char *fmt, ...)
-{
+bool Assert(int condition, const char *fmt, ...) {
     if (condition) {
         return true;
-    }
-    else {
+    } else {
         va_list args;
         Tmsg("\n  ?)");
         Tmsg("Assertion failed");
@@ -756,12 +716,6 @@ static VALUE frb_ts_term_vectors(VALUE v) { return INT2FIX(execute_test(32)); }
 static VALUE frb_ts_test(VALUE v)         { return INT2FIX(execute_test(33)); }
 static VALUE frb_ts_threading(VALUE v)    { return INT2FIX(execute_test(34)); }
 
-static VALUE frb_ts_posh(VALUE v) {
-    const char *posh = POSH_GetArchString();
-    printf("\n%s\n", posh);
-    return Qnil;
-}
-
 static VALUE frb_ts_run_all(VALUE v) {
     int i, test_count;
     int rv = 0;
@@ -832,6 +786,5 @@ void Init_Test(void) {
     rb_define_singleton_method(mTest, "term_vectors",   frb_ts_term_vectors, 0);
     rb_define_singleton_method(mTest, "test",           frb_ts_test, 0);
     rb_define_singleton_method(mTest, "threading",      frb_ts_threading, 0);
-    rb_define_singleton_method(mTest, "posh",           frb_ts_posh, 0);
     rb_define_singleton_method(mTest, "run_all",        frb_ts_run_all, 0);
 }