Bugfix: missing semicolon, missing macros, add todo, and remove extra errno check.

Add a missing semicolon.

Add the delete macros that are missing.
After looking at this, I noticed that I will need to call these delete macos, so add a @todo to designate that a series of memory management functions need to be written for this.

The ETIMEDOUT is not valid fo the f_thread_create() function.

diff --git a/level_0/f_thread/c/thread-common.h b/level_0/f_thread/c/thread-common.h
index 339e0a943e23feba24ba58d49e1e02aa8e0f2310..8f39edf09e400ac320798f33f12008e6d785d9ff 100644 (file)
--- a/level_0/f_thread/c/thread-common.h
+++ b/level_0/f_thread/c/thread-common.h
@@ -26,6 +26,10 @@ extern "C" {
 
   // This does not clear the thread.attributes.__size array (may need to memset() against a sizeof(pthread_attr_t)).
   #define f_macro_thread_attribute_t_clear(attribute) attribute.__align = 0
+
+  #define f_macro_thread_attribute_t_delete(status, attribute) status = f_thread_attribute_delete(&attribute);
+
+  #define f_macro_thread_attribute_t_delete_simple(attribute) f_thread_attribute_delete(&attribute);
 #endif // _di_f_thread_attribute_t_
 
 /**
@@ -48,6 +52,7 @@ extern "C" {
   #define f_macro_thread_attributes_t_resize(status, attributes, length) f_macro_memory_structure_resize(status, attributes, f_thread_attribute_t, length)
   #define f_macro_thread_attributes_t_adjust(status, attributes, length) f_macro_memory_structure_adjust(status, attributes, f_thread_attribute_t, length)
 
+  // @todo implement custom delete functions to call f_thread_attribute_delete() as appropriate.
   #define f_macro_thread_attributes_t_delete(status, attributes)  f_macro_memory_structure_delete(status, attributes, f_thread_attribute_t)
   #define f_macro_thread_attributes_t_destroy(status, attributes) f_macro_memory_structure_destroy(status, attributes, f_thread_attribute_t)
 
@@ -111,7 +116,7 @@ extern "C" {
 
   #define f_thread_id_t_initialize 0
 
-  #define f_macro_thread_id_t_clear(id) id = 0
+  #define f_macro_thread_id_t_clear(id) id = 0;
 #endif // _di_f_thread_id_t_
 
 /**
@@ -238,9 +243,13 @@ extern "C" {
 #ifndef _di_f_thread_mutex_t_
   typedef pthread_mutex_t f_thread_mutex_t;
 
-  #define f_thread_mutex_t_initialize 0
+  #define f_thread_mutex_t_initialize PTHREAD_MUTEX_INITIALIZER
 
   #define f_macro_thread_mutex_t_clear(mutex) mutex = 0
+
+  #define f_macro_thread_mutex_t_delete(status, mutex) status = f_thread_mutex_delete(&mutex);
+
+  #define f_macro_thread_mutex_t_delete_simple(mutex) f_thread_mutex_delete(&mutex);
 #endif // _di_f_thread_mutex_t_
 
 /**
@@ -263,6 +272,7 @@ extern "C" {
   #define f_macro_thread_mutexs_t_resize(status, mutexs, length) f_macro_memory_structure_resize(status, mutexs, f_thread_mutex_t, length)
   #define f_macro_thread_mutexs_t_adjust(status, mutexs, length) f_macro_memory_structure_adjust(status, mutexs, f_thread_mutex_t, length)
 
+  // @todo implement custom delete functions to call f_thread_mutex_delete() as appropriate.
   #define f_macro_thread_mutexs_t_delete(status, mutexs)  f_macro_memory_structure_delete(status, mutexs, f_thread_mutex_t)
   #define f_macro_thread_mutexs_t_destroy(status, mutexs) f_macro_memory_structure_destroy(status, mutexs, f_thread_mutex_t)
 
@@ -380,6 +390,10 @@ extern "C" {
   #define f_macro_thread_set_t_clear(thread) \
     f_macro_thread_attribute_t_clear(thread.attributes) \
     f_macro_thread_id_t_clear(thread.id)
+
+  #define f_macro_thread_set_t_delete(status, set) f_macro_thread_attribute_t_delete(status, set.attribute)
+
+  #define f_macro_thread_set_t_delete_simple(set) f_macro_thread_attribute_t_delete_simple(set.attribute)
 #endif // _di_f_thread_set_t_
 
 /**
@@ -402,6 +416,7 @@ extern "C" {
   #define f_macro_thread_sets_t_resize(status, sets, length) f_macro_memory_structure_resize(status, sets, f_thread_set_t, length)
   #define f_macro_thread_sets_t_adjust(status, sets, length) f_macro_memory_structure_adjust(status, sets, f_thread_set_t, length)
 
+  // @todo implement custom delete functions to call f_macro_thread_set_t_delete() as appropriate.
   #define f_macro_thread_sets_t_delete(status, sets)  f_macro_memory_structure_delete(status, sets, f_thread_set_t)
   #define f_macro_thread_sets_t_destroy(status, sets) f_macro_memory_structure_destroy(status, sets, f_thread_set_t)
 

diff --git a/level_0/f_thread/c/thread.c b/level_0/f_thread/c/thread.c
index eac1436b1e911f80ca3b673f1bb43d52fc471d05..e56a4289043a98e00ea5b88bc22e8fe6f1b5a683 100644 (file)
--- a/level_0/f_thread/c/thread.c
+++ b/level_0/f_thread/c/thread.c
@@ -565,7 +565,6 @@ extern "C" {
       if (error == EAGAIN) return F_status_set_error(F_resource_not);
       if (error == EINVAL) return F_status_set_error(F_parameter);
       if (error == EPERM) return F_status_set_error(F_prohibited);
-      if (error == ETIMEDOUT) return F_time;
 
       return F_status_set_error(F_failure);
     }