update raii.h, cthread.c and exception.c

Author: TheTechsTech

include/raii.h

@@ -268,12 +268,14 @@ DO NOT FREE, will `throw/panic` if memory request fails. */
 
 /* Defer execution `LIFO` of given function with argument,
 execution begins when current `guard` scope exits or panic/throw. */
-#define _defer(func, ptr)       raii_recover_by(_$##__FUNCTION__, func, ptr)
+#define _defer(func, ptr)       raii_recover_by(_$##__FUNCTION__, (func_t)func, ptr)
 
 /* Compare `err` to scoped error condition, will mark exception handled, if `true`. */
 #define _recover(err)   raii_is_caught(raii_init()->arena, err)
 
-/* Compare `err` to scoped error condition, will mark exception handled, if `true`. */
+/* Compare `err` to scoped error condition,
+will mark exception handled, if `true`.
+DO NOT PUT `err` in quote's like "err". */
 #define _is_caught(err)   raii_is_caught(raii_init()->arena, EX_STR(err))
 
 /* Get scoped error condition string. */
@@ -370,7 +372,7 @@ On exit will begin executing deferred functions.
     #define finality ex_finality
     #define end_trying ex_end_trying
 #else
-    #define finality ex_finally
+    #define finality catch_any ex_finally
     #define end_trying ex_end_try
 #endif
 

src/cthread.c

@@ -24,10 +24,8 @@ freely, subject to the following restrictions:
 SPDX-License-Identifier: Zlib
 */
 
+#include "raii.h"
 #ifndef HAS_C11_THREADS
-#include "cthread.h"
-#include <stdlib.h>
-
 /* Platform specific includes */
 #if defined(_TTHREAD_POSIX_)
   #include <signal.h>
@@ -581,7 +579,7 @@ static void * _thrd_wrapper_function(void * aArg)
   arg = ti->mArg;
 
   /* The thread is responsible for freeing the startup information */
-  free((void *)ti);
+  RAII_FREE((void *)ti);
 
   /* Call the actual client thread function */
   res = fun(arg);
@@ -671,7 +669,7 @@ static void _remove_thread_data(DWORD thread_id)
     if (node->thread_id == thread_id)
     {
       _cthread_thread_head = node->next;
-      free(node);
+      RAII_FREE(node);
       ReleaseSRWLockExclusive(&_cthread_thread_head_srwlock);
       return;
     }
@@ -681,7 +679,7 @@ static void _remove_thread_data(DWORD thread_id)
       {
         struct CThreadThrdData* needle = node->next;
         node->next = needle->next;
-        free(needle);
+        RAII_FREE(needle);
         ReleaseSRWLockExclusive(&_cthread_thread_head_srwlock);
         return;
       }
@@ -696,7 +694,7 @@ 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));
+  _thread_start_info* ti = (_thread_start_info*)RAII_MALLOC(sizeof(_thread_start_info));
   if (ti == NULL)
   {
     return thrd_nomem;
@@ -707,17 +705,17 @@ int thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
   /* Create the thread */
 #if defined(_TTHREAD_WIN32_)
   struct CThreadThrdData* data;
-  data = (struct CThreadThrdData*)malloc(sizeof(struct CThreadThrdData));
+  data = (struct CThreadThrdData*)RAII_MALLOC(sizeof(struct CThreadThrdData));
   if (data == NULL)
   {
-    free(ti);
+    RAII_FREE(ti);
     return thrd_nomem;
   }
   HANDLE handle = CreateThread(NULL, 0, _thrd_wrapper_function, (LPVOID)ti, 0, NULL);
   if (handle == NULL)
   {
-    free(ti);
-    free(data);
+    RAII_FREE(ti);
+    RAII_FREE(data);
     return thrd_error;
   }
   data->handle = handle;
@@ -728,7 +726,7 @@ int thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
 #elif defined(_TTHREAD_POSIX_)
   if(pthread_create(thr, NULL, _thrd_wrapper_function, (void *)ti) != 0)
   {
-      free(ti);
+      RAII_FREE(ti);
       return thrd_error;
   }
 #endif
@@ -965,7 +963,7 @@ int tss_set(tss_t key, void *val)
   struct CThreadTSSData* data = (struct CThreadTSSData*)TlsGetValue(key);
   if (data == NULL)
   {
-    data = (struct CThreadTSSData*)malloc(sizeof(struct CThreadTSSData));
+    data = (struct CThreadTSSData*)RAII_MALLOC(sizeof(struct CThreadTSSData));
     if (data == NULL)
     {
       return thrd_error;

src/exception.c

@@ -2,43 +2,12 @@
 #undef _FORTIFY_SOURCE
 #endif
 #include "raii.h"
-/*
- o---------------------------------------------------------------------o
- |
- | Exception in C
- |
- | Copyright (c) 2001+ Laurent Deniau, [email protected]
- |
- | For more information, see:
- | http://cern.ch/laurent.deniau/oopc.html
- |
- o---------------------------------------------------------------------o
- |
- | Exception in C is free software; you can redistribute it and/or
- | modify it under the terms of the GNU Lesser General Public License
- | as published by the Free Software Foundation; either version 2.1 of
- | the License, or (at your option) any later version.
- |
- | The C Object System is distributed in the hope that it will be
- | useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- | of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- | Lesser General Public License for more details.
- |
- | You should have received a copy of the GNU Lesser General Public
- | License along with this library; if not, write to the Free
- | Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- | Boston, MA 02110-1301 USA
- |
- o---------------------------------------------------------------------o
- |
- | $Id$
- |
-*/
 
 /* Some common exception */
 EX_EXCEPTION(invalid_type);
 EX_EXCEPTION(range_error);
 EX_EXCEPTION(divide_by_zero);
+EX_EXCEPTION(division_by_zero);
 EX_EXCEPTION(out_of_memory);
 EX_EXCEPTION(panic);
 
@@ -387,11 +356,9 @@ void ex_signal_reset(int sig) {
      */
     ex_sig_sa.sa_handler = SIG_DFL;
     if (sigemptyset(&ex_sig_sa.sa_mask) != 0)
-        fprintf(stderr, "Cannot setup handler for signal no %d (%s)\n",
-                sig, ex);
+        fprintf(stderr, "Cannot setup handler for signal no %d\n", sig);
     else if (sigaction(sig, &ex_sig_sa, NULL) != 0)
-        fprintf(stderr, "Cannot restore handler for signal no %d (%s)\n",
-                sig, ex);
+        fprintf(stderr, "Cannot restore handler for signal no %d\n", sig);
 #endif
     exception_signal_set = false;
 }