From 47f540a4f9f58cb9e845d784493aa396a55803a5 Mon Sep 17 00:00:00 2001
From: Michael Zillgith <michael.zillgith@mz-automation.de>
Date: Wed, 6 Mar 2019 15:54:15 +0100
Subject: [PATCH] - HAL: some changes to linux and BSD hal implementations

---
 hal/socket/bsd/socket_bsd.c     |  8 +++--
 hal/socket/linux/socket_linux.c |  9 +++--
 hal/thread/bsd/thread_bsd.c     | 61 +++++++++++++++++----------------
 3 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/hal/socket/bsd/socket_bsd.c b/hal/socket/bsd/socket_bsd.c
index cb5574df..ae39e5e0 100644
--- a/hal/socket/bsd/socket_bsd.c
+++ b/hal/socket/bsd/socket_bsd.c
@@ -428,8 +428,12 @@ Socket_write(Socket self, uint8_t* buf, int size)
     if (self->fd == -1)
         return -1;
 
-    // MSG_NOSIGNAL - prevent send to signal SIGPIPE when peer unexpectedly closed the socket
-    return send(self->fd, buf, size, 0);
+    int retVal = send(self->fd, buf, size, 0);
+
+    if ((retVal == -1) && (errno == EAGAIN))
+        return 0;
+    else
+        return retVal;
 }
 
 void
diff --git a/hal/socket/linux/socket_linux.c b/hal/socket/linux/socket_linux.c
index 64c0a4b6..b6d2eb6c 100644
--- a/hal/socket/linux/socket_linux.c
+++ b/hal/socket/linux/socket_linux.c
@@ -475,8 +475,13 @@ Socket_write(Socket self, uint8_t* buf, int size)
     if (self->fd == -1)
         return -1;
 
-    // MSG_NOSIGNAL - prevent send to signal SIGPIPE when peer unexpectedly closed the socket
-    return send(self->fd, buf, size, MSG_NOSIGNAL);
+    /* MSG_NOSIGNAL - prevent send to signal SIGPIPE when peer unexpectedly closed the socket */
+    int retVal = send(self->fd, buf, size, MSG_NOSIGNAL);
+
+    if ((retVal == -1) && (errno == EAGAIN))
+        return 0;
+    else
+        return retVal;
 }
 
 void
diff --git a/hal/thread/bsd/thread_bsd.c b/hal/thread/bsd/thread_bsd.c
index 7d882d22..757b733d 100644
--- a/hal/thread/bsd/thread_bsd.c
+++ b/hal/thread/bsd/thread_bsd.c
@@ -25,23 +25,24 @@
 #include <semaphore.h>
 #include <unistd.h>
 #include "hal_thread.h"
-
+#include "libiec61850_platform_includes.h"
 #include "lib_memory.h"
 
-struct sThread {
-   ThreadExecutionFunction function;
-   void* parameter;
-   pthread_t pthread;
-   int state;
-   bool autodestroy;
+struct sThread
+{
+    ThreadExecutionFunction function;
+    void* parameter;
+    pthread_t pthread;
+    int state;
+    bool autodestroy;
 };
 
 Semaphore
 Semaphore_create(int initialValue)
 {
-    char tmpname[] = {"/tmp/libiec61850.XXXXXX"};
-    mktemp(tmpname);
-    Semaphore self = sem_open(tmpname, O_CREAT, 0666, initialValue);
+    Semaphore self = GLOBAL_MALLOC(sizeof(sem_t));
+
+    sem_init((sem_t*) self, 0, initialValue);
 
     return self;
 }
@@ -68,16 +69,16 @@ Semaphore_destroy(Semaphore self)
 Thread
 Thread_create(ThreadExecutionFunction function, void* parameter, bool autodestroy)
 {
-   Thread thread = (Thread) GLOBAL_MALLOC(sizeof(struct sThread));
+    Thread thread = (Thread) GLOBAL_MALLOC(sizeof(struct sThread));
 
-   if (thread != NULL) {
+    if (thread != NULL) {
         thread->parameter = parameter;
         thread->function = function;
         thread->state = 0;
         thread->autodestroy = autodestroy;
-   }
+    }
 
-   return thread;
+    return thread;
 }
 
 static void*
@@ -85,38 +86,38 @@ destroyAutomaticThread(void* parameter)
 {
     Thread thread = (Thread) parameter;
 
-   thread->function(thread->parameter);
+    thread->function(thread->parameter);
 
-   GLOBAL_FREEMEM(thread);
+    GLOBAL_FREEMEM(thread);
 
-   pthread_exit(NULL);
+    pthread_exit(NULL);
 }
 
 void
 Thread_start(Thread thread)
 {
-   if (thread->autodestroy == true) {
-       pthread_create(&thread->pthread, NULL, destroyAutomaticThread, thread);
-       pthread_detach(thread->pthread);
-   }
-   else
-       pthread_create(&thread->pthread, NULL, thread->function, thread->parameter);
-
-   thread->state = 1;
+    if (thread->autodestroy == true) {
+        pthread_create(&thread->pthread, NULL, destroyAutomaticThread, thread);
+        pthread_detach(thread->pthread);
+    }
+    else
+        pthread_create(&thread->pthread, NULL, thread->function, thread->parameter);
+
+    thread->state = 1;
 }
 
 void
 Thread_destroy(Thread thread)
 {
-   if (thread->state == 1) {
-       pthread_join(thread->pthread, NULL);
-   }
+    if (thread->state == 1) {
+        pthread_join(thread->pthread, NULL);
+    }
 
-   GLOBAL_FREEMEM(thread);
+    GLOBAL_FREEMEM(thread);
 }
 
 void
 Thread_sleep(int millies)
 {
-   usleep(millies * 1000);
+    usleep(millies * 1000);
 }