1) REMOVED files/modules not relevant: makes lib more focused:

- threads.h/threads.c (external lib)
- coptions.h - will be kept as a gist.
- more will follow, (examples, some benchmarks, etc).
2) Replaced UTF8 decoder with Björn Höhrmann's DFA decoder.

2 files changed, 35 insertions, 985 deletions

diff --git a/src/threads.c b/src/threads.c
deleted file mode 100644
index 92b966b1..00000000
--- a/src/threads.c
+++ /dev/null
@@ -1,932 +0,0 @@
-/* -*- mode: c; tab-width: 2; indent-tabs-mode: nil; -*-

-Copyright (c) 2012 Marcus Geelnard

-Copyright (c) 2013-2016 Evan Nemerson

-

-This software is provided 'as-is', without any express or implied

-warranty. In no event will the authors be held liable for any damages

-arising from the use of this software.

-

-Permission is granted to anyone to use this software for any purpose,

-including commercial applications, and to alter it and redistribute it

-freely, subject to the following restrictions:

-

-    1. The origin of this software must not be misrepresented; you must not

-    claim that you wrote the original software. If you use this software

-    in a product, an acknowledgment in the product documentation would be

-    appreciated but is not required.

-

-    2. Altered source versions must be plainly marked as such, and must not be

-    misrepresented as being the original software.

-

-    3. This notice may not be removed or altered from any source

-    distribution.

-*/

-

-#include "threads.h"

-#include <stdlib.h>

-#include <stdint.h>

-

-/* Platform specific includes */

-#if defined(_TTHREAD_POSIX_)

-  #include <signal.h>

-  #include <sched.h>

-  #include <unistd.h>

-  #include <sys/time.h>

-  #include <errno.h>

-#elif defined(_TTHREAD_WIN32_)

-  #include <process.h>

-  #include <sys/timeb.h>

-#endif

-

-/* Standard, good-to-have defines */

-#ifndef NULL

-  #define NULL (void*)0

-#endif

-#ifndef TRUE

-  #define TRUE 1

-#endif

-#ifndef FALSE

-  #define FALSE 0

-#endif

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-

-int mtx_init(mtx_t *mtx, int type)

-{

-#if defined(_TTHREAD_WIN32_)

-  mtx->mAlreadyLocked = FALSE;

-  mtx->mRecursive = type & mtx_recursive;

-  mtx->mTimed = type & mtx_timed;

-  if (!mtx->mTimed)

-  {

-    InitializeCriticalSection(&(mtx->mHandle.cs));

-  }

-  else

-  {

-    mtx->mHandle.mut = CreateMutex(NULL, FALSE, NULL);

-    if (mtx->mHandle.mut == NULL)

-    {

-      return thrd_error;

-    }

-  }

-  return thrd_success;

-#else

-  int ret;

-  pthread_mutexattr_t attr;

-  pthread_mutexattr_init(&attr);

-  if (type & mtx_recursive)

-  {

-    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);

-  }

-  ret = pthread_mutex_init(mtx, &attr);

-  pthread_mutexattr_destroy(&attr);

-  return ret == 0 ? thrd_success : thrd_error;

-#endif

-}

-

-void mtx_destroy(mtx_t *mtx)

-{

-#if defined(_TTHREAD_WIN32_)

-  if (!mtx->mTimed)

-  {

-    DeleteCriticalSection(&(mtx->mHandle.cs));

-  }

-  else

-  {

-    CloseHandle(mtx->mHandle.mut);

-  }

-#else

-  pthread_mutex_destroy(mtx);

-#endif

-}

-

-int mtx_lock(mtx_t *mtx)

-{

-#if defined(_TTHREAD_WIN32_)

-  if (!mtx->mTimed)

-  {

-    EnterCriticalSection(&(mtx->mHandle.cs));

-  }

-  else

-  {

-    switch (WaitForSingleObject(mtx->mHandle.mut, INFINITE))

-    {

-      case WAIT_OBJECT_0:

-        break;

-      case WAIT_ABANDONED:

-      default:

-        return thrd_error;

-    }

-  }

-

-  if (!mtx->mRecursive)

-  {

-    while(mtx->mAlreadyLocked) Sleep(1); /* Simulate deadlock... */

-    mtx->mAlreadyLocked = TRUE;

-  }

-  return thrd_success;

-#else

-  return pthread_mutex_lock(mtx) == 0 ? thrd_success : thrd_error;

-#endif

-}

-

-int mtx_timedlock(mtx_t *mtx, const struct timespec *ts)

-{

-#if defined(_TTHREAD_WIN32_)

-  struct timespec current_ts;

-  DWORD timeoutMs;

-

-  if (!mtx->mTimed)

-  {

-    return thrd_error;

-  }

-

-  timespec_get(&current_ts, TIME_UTC);

-

-  if ((current_ts.tv_sec > ts->tv_sec) || ((current_ts.tv_sec == ts->tv_sec) && (current_ts.tv_nsec >= ts->tv_nsec)))

-  {

-    timeoutMs = 0;

-  }

-  else

-  {

-    timeoutMs  = (DWORD)(ts->tv_sec  - current_ts.tv_sec)  * 1000;

-    timeoutMs += (ts->tv_nsec - current_ts.tv_nsec) / 1000000;

-    timeoutMs += 1;

-  }

-

-  /* TODO: the timeout for WaitForSingleObject doesn't include time

-     while the computer is asleep. */

-  switch (WaitForSingleObject(mtx->mHandle.mut, timeoutMs))

-  {

-    case WAIT_OBJECT_0:

-      break;

-    case WAIT_TIMEOUT:

-      return thrd_timedout;

-    case WAIT_ABANDONED:

-    default:

-      return thrd_error;

-  }

-

-  if (!mtx->mRecursive)

-  {

-    while(mtx->mAlreadyLocked) Sleep(1); /* Simulate deadlock... */

-    mtx->mAlreadyLocked = TRUE;

-  }

-

-  return thrd_success;

-#elif defined(_POSIX_TIMEOUTS) && (_POSIX_TIMEOUTS >= 200112L) && defined(_POSIX_THREADS) && (_POSIX_THREADS >= 200112L)

-  switch (pthread_mutex_timedlock(mtx, ts)) {

-    case 0:

-      return thrd_success;

-    case ETIMEDOUT:

-      return thrd_timedout;

-    default:

-      return thrd_error;

-  }

-#else

-  int rc;

-  struct timespec cur, dur;

-

-  /* Try to acquire the lock and, if we fail, sleep for 5ms. */

-  while ((rc = pthread_mutex_trylock (mtx)) == EBUSY) {

-    timespec_get(&cur, TIME_UTC);

-

-    if ((cur.tv_sec > ts->tv_sec) || ((cur.tv_sec == ts->tv_sec) && (cur.tv_nsec >= ts->tv_nsec)))

-    {

-      break;

-    }

-

-    dur.tv_sec = ts->tv_sec - cur.tv_sec;

-    dur.tv_nsec = ts->tv_nsec - cur.tv_nsec;

-    if (dur.tv_nsec < 0)

-    {

-      dur.tv_sec--;

-      dur.tv_nsec += 1000000000;

-    }

-

-    if ((dur.tv_sec != 0) || (dur.tv_nsec > 5000000))

-    {

-      dur.tv_sec = 0;

-      dur.tv_nsec = 5000000;

-    }

-

-    nanosleep(&dur, NULL);

-  }

-

-  switch (rc) {

-    case 0:

-      return thrd_success;

-    case ETIMEDOUT:

-    case EBUSY:

-      return thrd_timedout;

-    default:

-      return thrd_error;

-  }

-#endif

-}

-

-int mtx_trylock(mtx_t *mtx)

-{

-#if defined(_TTHREAD_WIN32_)

-  int ret;

-

-  if (!mtx->mTimed)

-  {

-    ret = TryEnterCriticalSection(&(mtx->mHandle.cs)) ? thrd_success : thrd_busy;

-  }

-  else

-  {

-    ret = (WaitForSingleObject(mtx->mHandle.mut, 0) == WAIT_OBJECT_0) ? thrd_success : thrd_busy;

-  }

-

-  if ((!mtx->mRecursive) && (ret == thrd_success))

-  {

-    if (mtx->mAlreadyLocked)

-    {

-      LeaveCriticalSection(&(mtx->mHandle.cs));

-      ret = thrd_busy;

-    }

-    else

-    {

-      mtx->mAlreadyLocked = TRUE;

-    }

-  }

-  return ret;

-#else

-  return (pthread_mutex_trylock(mtx) == 0) ? thrd_success : thrd_busy;

-#endif

-}

-

-int mtx_unlock(mtx_t *mtx)

-{

-#if defined(_TTHREAD_WIN32_)

-  mtx->mAlreadyLocked = FALSE;

-  if (!mtx->mTimed)

-  {

-    LeaveCriticalSection(&(mtx->mHandle.cs));

-  }

-  else

-  {

-    if (!ReleaseMutex(mtx->mHandle.mut))

-    {

-      return thrd_error;

-    }

-  }

-  return thrd_success;

-#else

-  return pthread_mutex_unlock(mtx) == 0 ? thrd_success : thrd_error;;

-#endif

-}

-

-#if defined(_TTHREAD_WIN32_)

-#define _CONDITION_EVENT_ONE 0

-#define _CONDITION_EVENT_ALL 1

-#endif

-

-int cnd_init(cnd_t *cond)

-{

-#if defined(_TTHREAD_WIN32_)

-  cond->mWaitersCount = 0;

-

-  /* Init critical section */

-  InitializeCriticalSection(&cond->mWaitersCountLock);

-

-  /* Init events */

-  cond->mEvents[_CONDITION_EVENT_ONE] = CreateEvent(NULL, FALSE, FALSE, NULL);

-  if (cond->mEvents[_CONDITION_EVENT_ONE] == NULL)

-  {

-    cond->mEvents[_CONDITION_EVENT_ALL] = NULL;

-    return thrd_error;

-  }

-  cond->mEvents[_CONDITION_EVENT_ALL] = CreateEvent(NULL, TRUE, FALSE, NULL);

-  if (cond->mEvents[_CONDITION_EVENT_ALL] == NULL)

-  {

-    CloseHandle(cond->mEvents[_CONDITION_EVENT_ONE]);

-    cond->mEvents[_CONDITION_EVENT_ONE] = NULL;

-    return thrd_error;

-  }

-

-  return thrd_success;

-#else

-  return pthread_cond_init(cond, NULL) == 0 ? thrd_success : thrd_error;

-#endif

-}

-

-void cnd_destroy(cnd_t *cond)

-{

-#if defined(_TTHREAD_WIN32_)

-  if (cond->mEvents[_CONDITION_EVENT_ONE] != NULL)

-  {

-    CloseHandle(cond->mEvents[_CONDITION_EVENT_ONE]);

-  }

-  if (cond->mEvents[_CONDITION_EVENT_ALL] != NULL)

-  {

-    CloseHandle(cond->mEvents[_CONDITION_EVENT_ALL]);

-  }

-  DeleteCriticalSection(&cond->mWaitersCountLock);

-#else

-  pthread_cond_destroy(cond);

-#endif

-}

-

-int cnd_signal(cnd_t *cond)

-{

-#if defined(_TTHREAD_WIN32_)

-  int haveWaiters;

-

-  /* Are there any waiters? */

-  EnterCriticalSection(&cond->mWaitersCountLock);

-  haveWaiters = (cond->mWaitersCount > 0);

-  LeaveCriticalSection(&cond->mWaitersCountLock);

-

-  /* If we have any waiting threads, send them a signal */

-  if(haveWaiters)

-  {

-    if (SetEvent(cond->mEvents[_CONDITION_EVENT_ONE]) == 0)

-    {

-      return thrd_error;

-    }

-  }

-

-  return thrd_success;

-#else

-  return pthread_cond_signal(cond) == 0 ? thrd_success : thrd_error;

-#endif

-}

-

-int cnd_broadcast(cnd_t *cond)

-{

-#if defined(_TTHREAD_WIN32_)

-  int haveWaiters;

-

-  /* Are there any waiters? */

-  EnterCriticalSection(&cond->mWaitersCountLock);

-  haveWaiters = (cond->mWaitersCount > 0);

-  LeaveCriticalSection(&cond->mWaitersCountLock);

-

-  /* If we have any waiting threads, send them a signal */

-  if(haveWaiters)

-  {

-    if (SetEvent(cond->mEvents[_CONDITION_EVENT_ALL]) == 0)

-    {

-      return thrd_error;

-    }

-  }

-

-  return thrd_success;

-#else

-  return pthread_cond_broadcast(cond) == 0 ? thrd_success : thrd_error;

-#endif

-}

-

-#if defined(_TTHREAD_WIN32_)

-static int _cnd_timedwait_win32(cnd_t *cond, mtx_t *mtx, DWORD timeout)

-{

-  DWORD result;

-  int lastWaiter;

-

-  /* Increment number of waiters */

-  EnterCriticalSection(&cond->mWaitersCountLock);

-  ++ cond->mWaitersCount;

-  LeaveCriticalSection(&cond->mWaitersCountLock);

-

-  /* Release the mutex while waiting for the condition (will decrease

-     the number of waiters when done)... */

-  mtx_unlock(mtx);

-

-  /* Wait for either event to become signaled due to cnd_signal() or

-     cnd_broadcast() being called */

-  result = WaitForMultipleObjects(2, cond->mEvents, FALSE, timeout);

-  if (result == WAIT_TIMEOUT)

-  {

-    /* The mutex is locked again before the function returns, even if an error occurred */

-    mtx_lock(mtx);

-    return thrd_timedout;

-  }

-  else if (result == WAIT_FAILED)

-  {

-    /* The mutex is locked again before the function returns, even if an error occurred */

-    mtx_lock(mtx);

-    return thrd_error;

-  }

-

-  /* Check if we are the last waiter */

-  EnterCriticalSection(&cond->mWaitersCountLock);

-  -- cond->mWaitersCount;

-  lastWaiter = (result == (WAIT_OBJECT_0 + _CONDITION_EVENT_ALL)) &&

-               (cond->mWaitersCount == 0);

-  LeaveCriticalSection(&cond->mWaitersCountLock);

-

-  /* If we are the last waiter to be notified to stop waiting, reset the event */

-  if (lastWaiter)

-  {

-    if (ResetEvent(cond->mEvents[_CONDITION_EVENT_ALL]) == 0)

-    {

-      /* The mutex is locked again before the function returns, even if an error occurred */

-      mtx_lock(mtx);

-      return thrd_error;

-    }

-  }

-

-  /* Re-acquire the mutex */

-  mtx_lock(mtx);

-

-  return thrd_success;

-}

-#endif

-

-int cnd_wait(cnd_t *cond, mtx_t *mtx)

-{

-#if defined(_TTHREAD_WIN32_)

-  return _cnd_timedwait_win32(cond, mtx, INFINITE);

-#else

-  return pthread_cond_wait(cond, mtx) == 0 ? thrd_success : thrd_error;

-#endif

-}

-

-int cnd_timedwait(cnd_t *cond, mtx_t *mtx, const struct timespec *ts)

-{

-#if defined(_TTHREAD_WIN32_)

-  struct timespec now;

-  if (timespec_get(&now, TIME_UTC) == TIME_UTC)

-  {

-    unsigned long long nowInMilliseconds = now.tv_sec * 1000 + now.tv_nsec / 1000000;

-    unsigned long long tsInMilliseconds  = ts->tv_sec * 1000 + ts->tv_nsec / 1000000;

-    DWORD delta = (tsInMilliseconds > nowInMilliseconds) ?

-      (DWORD)(tsInMilliseconds - nowInMilliseconds) : 0;

-    return _cnd_timedwait_win32(cond, mtx, delta);

-  }

-  else

-    return thrd_error;

-#else

-  int ret;

-  ret = pthread_cond_timedwait(cond, mtx, ts);

-  if (ret == ETIMEDOUT)

-  {

-    return thrd_timedout;

-  }

-  return ret == 0 ? thrd_success : thrd_error;

-#endif

-}

-

-#if defined(_TTHREAD_WIN32_)

-struct TinyCThreadTSSData {

-  void* value;

-  tss_t key;

-  struct TinyCThreadTSSData* next;

-};

-

-static tss_dtor_t _tinycthread_tss_dtors[1088] = { NULL, };

-

-static _Thread_local struct TinyCThreadTSSData* _tinycthread_tss_head = NULL;

-static _Thread_local struct TinyCThreadTSSData* _tinycthread_tss_tail = NULL;

-

-static void _tinycthread_tss_cleanup (void);

-

-static void _tinycthread_tss_cleanup (void) {

-  struct TinyCThreadTSSData* data;

-  int iteration;

-  unsigned int again = 1;

-  void* value;

-

-  for (iteration = 0 ; iteration < TSS_DTOR_ITERATIONS && again > 0 ; iteration++)

-  {

-    again = 0;

-    for (data = _tinycthread_tss_head ; data != NULL ; data = data->next)

-    {

-      if (data->value != NULL)

-      {

-        value = data->value;

-        data->value = NULL;

-

-        if (_tinycthread_tss_dtors[data->key] != NULL)

-        {

-          again = 1;

-          _tinycthread_tss_dtors[data->key](value);

-        }

-      }

-    }

-  }

-

-  while (_tinycthread_tss_head != NULL) {

-    data = _tinycthread_tss_head->next;

-    free (_tinycthread_tss_head);

-    _tinycthread_tss_head = data;

-  }

-  _tinycthread_tss_head = NULL;

-  _tinycthread_tss_tail = NULL;

-}

-

-static void NTAPI _tinycthread_tss_callback(PVOID h, DWORD dwReason, PVOID pv)

-{

-  (void)h;

-  (void)pv;

-

-  if (_tinycthread_tss_head != NULL && (dwReason == DLL_THREAD_DETACH || dwReason == DLL_PROCESS_DETACH))

-  {

-    _tinycthread_tss_cleanup();

-  }

-}

-

-#if defined(_MSC_VER)

-  #ifdef _M_X64

-    #pragma const_seg(".CRT$XLB")

-  #else

-    #pragma data_seg(".CRT$XLB")

-  #endif

-  PIMAGE_TLS_CALLBACK p_thread_callback = _tinycthread_tss_callback;

-  #ifdef _M_X64

-    #pragma data_seg()

-  #else

-    #pragma const_seg()

-  #endif

-#else

-  PIMAGE_TLS_CALLBACK p_thread_callback __attribute__((section(".CRT$XLB"))) = _tinycthread_tss_callback;

-#endif

-

-#endif /* defined(_TTHREAD_WIN32_) */

-

-/** Information to pass to the new thread (what to run). */

-typedef struct {

-  thrd_start_t mFunction; /**< Pointer to the function to be executed. */

-  void * mArg;            /**< Function argument for the thread function. */

-} _thread_start_info;

-

-/* Thread wrapper function. */

-#if defined(_TTHREAD_WIN32_)

-static DWORD WINAPI _thrd_wrapper_function(LPVOID aArg)

-#elif defined(_TTHREAD_POSIX_)

-static void * _thrd_wrapper_function(void * aArg)

-#endif

-{

-  thrd_start_t fun;

-  void *arg;

-  int  res;

-

-  /* Get thread startup information */

-  _thread_start_info *ti = (_thread_start_info *) aArg;

-  fun = ti->mFunction;

-  arg = ti->mArg;

-

-  /* The thread is responsible for freeing the startup information */

-  free((void *)ti);

-

-  /* Call the actual client thread function */

-  res = fun(arg);

-

-#if defined(_TTHREAD_WIN32_)

-  if (_tinycthread_tss_head != NULL)

-  {

-    _tinycthread_tss_cleanup();

-  }

-

-  return (DWORD)res;

-#else

-  return (void*)(intptr_t)res;

-#endif

-}

-

-int thrd_create(thrd_t *thr, thrd_start_t func, void *arg)

-{

-  /* Fill out the thread startup information (passed to the thread wrapper,

-     which will eventually free it) */

-  _thread_start_info* ti = (_thread_start_info*)malloc(sizeof(_thread_start_info));

-  if (ti == NULL)

-  {

-    return thrd_nomem;

-  }

-  ti->mFunction = func;

-  ti->mArg = arg;

-

-  /* Create the thread */

-#if defined(_TTHREAD_WIN32_)

-  *thr = CreateThread(NULL, 0, _thrd_wrapper_function, (LPVOID) ti, 0, NULL);

-#elif defined(_TTHREAD_POSIX_)

-  if(pthread_create(thr, NULL, _thrd_wrapper_function, (void *)ti) != 0)

-  {

-    *thr = 0;

-  }

-#endif

-

-  /* Did we fail to create the thread? */

-  if(!*thr)

-  {

-    free(ti);

-    return thrd_error;

-  }

-

-  return thrd_success;

-}

-

-thrd_t thrd_current(void)

-{

-#if defined(_TTHREAD_WIN32_)

-  return GetCurrentThread();

-#else

-  return pthread_self();

-#endif

-}

-

-int thrd_detach(thrd_t thr)

-{

-#if defined(_TTHREAD_WIN32_)

-  /* https://stackoverflow.com/questions/12744324/how-to-detach-a-thread-on-windows-c#answer-12746081 */

-  return CloseHandle(thr) != 0 ? thrd_success : thrd_error;

-#else

-  return pthread_detach(thr) == 0 ? thrd_success : thrd_error;

-#endif

-}

-

-int thrd_equal(thrd_t thr0, thrd_t thr1)

-{

-#if defined(_TTHREAD_WIN32_)

-  return GetThreadId(thr0) == GetThreadId(thr1);

-#else

-  return pthread_equal(thr0, thr1);

-#endif

-}

-

-void thrd_exit(int res)

-{

-#if defined(_TTHREAD_WIN32_)

-  if (_tinycthread_tss_head != NULL)

-  {

-    _tinycthread_tss_cleanup();

-  }

-

-  ExitThread((DWORD)res);

-#else

-  pthread_exit((void*)(intptr_t)res);

-#endif

-}

-

-int thrd_join(thrd_t thr, int *res)

-{

-#if defined(_TTHREAD_WIN32_)

-  DWORD dwRes;

-

-  if (WaitForSingleObject(thr, INFINITE) == WAIT_FAILED)

-  {

-    return thrd_error;

-  }

-  if (res != NULL)

-  {

-    if (GetExitCodeThread(thr, &dwRes) != 0)

-    {

-      *res = (int) dwRes;

-    }

-    else

-    {

-      return thrd_error;

-    }

-  }

-  CloseHandle(thr);

-#elif defined(_TTHREAD_POSIX_)

-  void *pres;

-  if (pthread_join(thr, &pres) != 0)

-  {

-    return thrd_error;

-  }

-  if (res != NULL)

-  {

-    *res = (int)(intptr_t)pres;

-  }

-#endif

-  return thrd_success;

-}

-

-int thrd_sleep(const struct timespec *duration, struct timespec *remaining)

-{

-#if !defined(_TTHREAD_WIN32_)

-  int res = nanosleep(duration, remaining);

-  if (res == 0) {

-    return 0;

-  } else if (errno == EINTR) {

-    return -1;

-  } else {

-    return -2;

-  }

-#else

-  struct timespec start;

-  DWORD t;

-

-  timespec_get(&start, TIME_UTC);

-

-  t = SleepEx((DWORD)(duration->tv_sec * 1000 +

-              duration->tv_nsec / 1000000 +

-              (((duration->tv_nsec % 1000000) == 0) ? 0 : 1)),

-              TRUE);

-

-  if (t == 0) {

-    return 0;

-  } else {

-    if (remaining != NULL) {

-      timespec_get(remaining, TIME_UTC);

-      remaining->tv_sec -= start.tv_sec;

-      remaining->tv_nsec -= start.tv_nsec;

-      if (remaining->tv_nsec < 0)

-      {

-        remaining->tv_nsec += 1000000000;

-        remaining->tv_sec -= 1;

-      }

-    }

-

-    return (t == WAIT_IO_COMPLETION) ? -1 : -2;

-  }

-#endif

-}

-

-void thrd_yield(void)

-{

-#if defined(_TTHREAD_WIN32_)

-  Sleep(0);

-#else

-  sched_yield();

-#endif

-}

-

-int tss_create(tss_t *key, tss_dtor_t dtor)

-{

-#if defined(_TTHREAD_WIN32_)

-  *key = TlsAlloc();

-  if (*key == TLS_OUT_OF_INDEXES)

-  {

-    return thrd_error;

-  }

-  _tinycthread_tss_dtors[*key] = dtor;

-#else

-  if (pthread_key_create(key, dtor) != 0)

-  {

-    return thrd_error;

-  }

-#endif

-  return thrd_success;

-}

-

-void tss_delete(tss_t key)

-{

-#if defined(_TTHREAD_WIN32_)

-  struct TinyCThreadTSSData* data = (struct TinyCThreadTSSData*) TlsGetValue (key);

-  struct TinyCThreadTSSData* prev = NULL;

-  if (data != NULL)

-  {

-    if (data == _tinycthread_tss_head)

-    {

-      _tinycthread_tss_head = data->next;

-    }

-    else

-    {

-      prev = _tinycthread_tss_head;

-      if (prev != NULL)

-      {

-        while (prev->next != data)

-        {

-          prev = prev->next;

-        }

-      }

-    }

-

-    if (data == _tinycthread_tss_tail)

-    {

-      _tinycthread_tss_tail = prev;

-    }

-

-    free (data);

-  }

-  _tinycthread_tss_dtors[key] = NULL;

-  TlsFree(key);

-#else

-  pthread_key_delete(key);

-#endif

-}

-

-void *tss_get(tss_t key)

-{

-#if defined(_TTHREAD_WIN32_)

-  struct TinyCThreadTSSData* data = (struct TinyCThreadTSSData*)TlsGetValue(key);

-  if (data == NULL)

-  {

-    return NULL;

-  }

-  return data->value;

-#else

-  return pthread_getspecific(key);

-#endif

-}

-

-int tss_set(tss_t key, void *val)

-{

-#if defined(_TTHREAD_WIN32_)

-  struct TinyCThreadTSSData* data = (struct TinyCThreadTSSData*)TlsGetValue(key);

-  if (data == NULL)

-  {

-    data = (struct TinyCThreadTSSData*)malloc(sizeof(struct TinyCThreadTSSData));

-    if (data == NULL)

-    {

-      return thrd_error;

-    }

-

-    data->value = NULL;

-    data->key = key;

-    data->next = NULL;

-

-    if (_tinycthread_tss_tail != NULL)

-    {

-      _tinycthread_tss_tail->next = data;

-    }

-    else

-    {

-      _tinycthread_tss_tail = data;

-    }

-

-    if (_tinycthread_tss_head == NULL)

-    {

-      _tinycthread_tss_head = data;

-    }

-

-    if (!TlsSetValue(key, data))

-    {

-      free (data);

-      return thrd_error;

-    }

-  }

-  data->value = val;

-#else

-  if (pthread_setspecific(key, val) != 0)

-  {

-    return thrd_error;

-  }

-#endif

-  return thrd_success;

-}

-

-#if defined(_TTHREAD_EMULATE_TIMESPEC_GET_)

-int _tthread_timespec_get(struct timespec *ts, int base)

-{

-#if defined(_TTHREAD_WIN32_)

-  struct _timeb tb;

-#elif !defined(CLOCK_REALTIME)

-  struct timeval tv;

-#endif

-

-  if (base != TIME_UTC)

-  {

-    return 0;

-  }

-

-#if defined(_TTHREAD_WIN32_)

-  _ftime_s(&tb);

-  ts->tv_sec = (time_t)tb.time;

-  ts->tv_nsec = 1000000L * (long)tb.millitm;

-#elif defined(CLOCK_REALTIME)

-  base = (clock_gettime(CLOCK_REALTIME, ts) == 0) ? base : 0;

-#else

-  gettimeofday(&tv, NULL);

-  ts->tv_sec = (time_t)tv.tv_sec;

-  ts->tv_nsec = 1000L * (long)tv.tv_usec;

-#endif

-

-  return base;

-}

-#endif /* _TTHREAD_EMULATE_TIMESPEC_GET_ */

-

-#if defined(_TTHREAD_WIN32_)

-void call_once(once_flag *flag, void (*func)(void))

-{

-  /* The idea here is that we use a spin lock (via the

-     InterlockedCompareExchange function) to restrict access to the

-     critical section until we have initialized it, then we use the

-     critical section to block until the callback has completed

-     execution. */

-  while (flag->status < 3)

-  {

-    switch (flag->status)

-    {

-      case 0:

-        if (InterlockedCompareExchange (&(flag->status), 1, 0) == 0) {

-          InitializeCriticalSection(&(flag->lock));

-          EnterCriticalSection(&(flag->lock));

-          flag->status = 2;

-          func();

-          flag->status = 3;

-          LeaveCriticalSection(&(flag->lock));

-          return;

-        }

-        break;

-      case 1:

-        break;

-      case 2:

-        EnterCriticalSection(&(flag->lock));

-        LeaveCriticalSection(&(flag->lock));

-        break;

-    }

-  }

-}

-#endif /* defined(_TTHREAD_WIN32_) */

-

-#ifdef __cplusplus

-}

-#endif

diff --git a/src/utf8code.c b/src/utf8code.c
index 543070c3..0f74ffb6 100644
--- a/src/utf8code.c
+++ b/src/utf8code.c
@@ -3,28 +3,21 @@
 #include <stc/cstr.h>
 #include "utf8tabs.inc"
 
-// https://news.ycombinator.com/item?id=15423674
-// https://gist.github.com/s4y/344a355f8c1f99c6a4cb2347ec4323cc
-
-void utf8_decode(utf8_decode_t *d, const uint8_t b)
-{
-    switch (d->state) {
-    case UTF8_OK:
-        if      (b < 0x80) d->codep = b, d->size = 1;
-        else if (b < 0xC2) d->state = UTF8_ERROR, d->size = 0;
-        else if (b < 0xE0) d->state = 1, d->codep = b & 0x1F, d->size = 2;
-        else if (b < 0xF0) d->state = 2, d->codep = b & 0x0F, d->size = 3;
-        else if (b < 0xF5) d->state = 3, d->codep = b & 0x07, d->size = 4;
-        else d->state = UTF8_ERROR, d->size = 0;
-        break;
-    case 1: case 2: case 3:
-        if ((b & 0xC0) == 0x80) {
-            d->state -= 1;
-            d->codep = (d->codep << 6) | (b & 0x3F);
-        } else
-            d->state = UTF8_ERROR, d->size = 0;
-    }
-}
+const uint8_t utf8_dtab[] = {
+   0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+   0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+   0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+   0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,  9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
+   7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+   8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+  10,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3, 11,6,6,6,5,8,8,8,8,8,8,8,8,8,8,8,
+   0,12,24,36,60,96,84,12,12,12,48,72, 12,12,12,12,12,12,12,12,12,12,12,12,
+  12, 0,12,12,12,12,12, 0,12, 0,12,12, 12,24,12,12,12,12,12,24,12,24,12,12,
+  12,12,12,12,12,12,12,24,12,12,12,12, 12,24,12,12,12,12,12,12,12,24,12,12,
+  12,12,12,12,12,12,12,36,12,36,12,12, 12,36,12,12,12,12,12,36,12,36,12,12,
+  12,36,12,12,12,12,12,12,12,12,12,12, 
+};
 
 unsigned utf8_encode(char *out, uint32_t c)
 {
@@ -52,27 +45,18 @@ unsigned utf8_encode(char *out, uint32_t c)
     return 0;
 }
 
-void utf8_peek(utf8_decode_t* d, const char *s) {
-    utf8_decode(d, (uint8_t)*s++);
-    switch (d->size) {
-        case 4: utf8_decode(d, (uint8_t)*s++);
-        case 3: utf8_decode(d, (uint8_t)*s++);
-        case 2: utf8_decode(d, (uint8_t)*s++);
-    }
-}
-
 bool utf8_valid(const char* s) {
-    utf8_decode_t d = {UTF8_OK};
+    utf8_decode_t d = {.state=0};
     while (*s)
         utf8_decode(&d, (uint8_t)*s++);
-    return d.state == UTF8_OK;
+    return d.state == 0;
 }
 
 bool utf8_valid_n(const char* s, size_t n) {
-    utf8_decode_t d = {UTF8_OK};
+    utf8_decode_t d = {.state=0};
     while ((n-- != 0) & (*s != 0))
         utf8_decode(&d, (uint8_t)*s++);
-    return d.state == UTF8_OK;
+    return d.state == 0;
 }
 
 uint32_t utf8_tolower(uint32_t c) {
@@ -101,10 +85,10 @@ uint32_t utf8_toupper(uint32_t c) {
 }
 /*
 int utf8_icmp(const char* s1, const char* s2) {
-    utf8_decode_t d1 = {UTF8_OK}, d2 = {UTF8_OK};
-    for (;; s1 += d1.size, s2 += d2.size) {
-        utf8_peek(&d1, s1);
-        utf8_peek(&d2, s2);
+    utf8_decode_t d1 = {.state=0}, d2 = {.state=0};
+    for (;;) {
+        do { utf8_decode(&d1, (uint8_t)s1[j1++]); } while (d1.state);
+        do { utf8_decode(&d2, (uint8_t)s2[j2++]); } while (d2.state);
         int c = utf8_tolower(d1.codep) - utf8_tolower(d2.codep);
         if (c || !*s2)
             return c;
@@ -113,14 +97,14 @@ int utf8_icmp(const char* s1, const char* s2) {
 */
 int utf8_icmp_n(size_t u8max, const char* s1, const size_t n1,
                               const char* s2, const size_t n2) {
-    utf8_decode_t d1 = {UTF8_OK}, d2 = {UTF8_OK};
+    utf8_decode_t d1 = {.state=0}, d2 = {.state=0};
     size_t j1 = 0, j2 = 0;
-    for (; u8max-- && ((j1 < n1) & (j2 < n2)); j1 += d1.size, j2 += d2.size) {
-        utf8_peek(&d1, s1 + j1);
-        utf8_peek(&d2, s2 + j2);
+    while (u8max-- && ((j1 < n1) & (j2 < n2))) {
+        do { utf8_decode(&d1, (uint8_t)s1[j1++]); } while (d1.state);
+        do { utf8_decode(&d2, (uint8_t)s2[j2++]); } while (d2.state);
         int c = utf8_tolower(d1.codep) - utf8_tolower(d2.codep);
         if (c || !s2[j2])
-            return c;
+            return c;        
     }
     return (j2 < n2) - (j1 < n1);
 }
@@ -178,15 +162,13 @@ static cstr cstr_casefold(const cstr* self, struct fnfold fold) {
     cstr out = cstr_null;
     char *buf = cstr_reserve(&out, sv.size*3/2);
     uint32_t cp; size_t sz = 0;
-    utf8_decode_t d = {UTF8_OK};
-
-    for (; *sv.str; sv.str += d.size) {
-        utf8_peek(&d, sv.str);
-        switch (d.size) {
-        case 1:
-            buf[sz++] = (char)fold.conv_asc(*sv.str);
-            break;
-        default:
+    utf8_decode_t d = {.state=0};
+
+    while (*sv.str) {
+        do { utf8_decode(&d, (uint8_t)*sv.str++); } while (d.state);
+        if (d.codep < 128)
+            buf[sz++] = (char)fold.conv_asc(d.codep);
+        else {
             cp = fold.conv_u8(d.codep);
             sz += utf8_encode(buf + sz, cp);
         }