Small itimer fixes and code reworking. Fixed a reentrant problem on _…

…_res_state
AmigaLabs · Oct 2, 2023 · 8c67c2b · 8c67c2b
1 parent 6bcd209
commit 8c67c2b
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 80 deletions.
diff --git a/library/include/dos.h b/library/include/dos.h
@@ -14,6 +14,7 @@
 #include <sys/syslimits.h>
 #include <wchar.h>
 #include <setjmp.h>
+#include <resolv.h>
 
 /* Category name handling variables.  */
 #define NUM_LOCALES                (LC_MAX + 1)
@@ -503,6 +504,8 @@ struct _clib4 {
 
     /* termcap */
     char tgoto_buf[50];
+
+    struct __res_state _res_state;
 };
 
 #ifndef __getClib4

diff --git a/library/posix/raise.c b/library/posix/raise.c
@@ -10,19 +10,11 @@
 #include "stdio_headers.h"
 #endif /* _STDIO_HEADERS_H */
 
-#include "pthread/common.h"
-
-static APTR
-hook_function(struct Hook *hook, APTR userdata, struct Process *process) {
-    uint32 pid = (uint32) userdata;
-    (void) (hook);
-
-    if (process->pr_ProcessID == pid) {
-        return process;
-    }
+#ifndef _UNISTD_HEADERS_H
+#include "unistd_headers.h"
+#endif /* _UNISTD_HEADERS_H */
 
-    return 0;
-}
+#include "pthread/common.h"
 
 int
 raise(int sig) {
@@ -68,28 +60,10 @@ raise(int sig) {
                 if (sig == SIGINT || sig == SIGTERM || sig == SIGKILL) {
                     /* Check ig we have timer terminal running. If so let's kill it */
                     if (__clib4->tmr_real_task != NULL) {
-                        struct Hook h = {{NULL, NULL}, (HOOKFUNC) hook_function, NULL, NULL};
-                        int32 pid, process;
-
                         /* Block SIGALRM signal from raise */
                         sigblock(SIGALRM);
-                        /* Get itimer process ID */
-                        pid = __clib4->tmr_real_task->pr_ProcessID;
-
-                        Forbid();
-                        /* Scan for process */
-                        process = ProcessScan(&h, (CONST_APTR) pid, 0);
-                        /* If we find the process send a signal to kill it */
-                        while (process > 0) {
-                            /* Send a SIGBREAKF_CTRL_F signal until the timer task return to Wait state
-                             * and can get the signal */
-                            Signal((struct Task *) __clib4->tmr_real_task, SIGBREAKF_CTRL_F);
-                            process = ProcessScan(&h, (CONST_APTR) pid, 0);
-                            usleep(100);
-                        }
-                        Permit();
-                        WaitForChildExit(pid);
-                        __clib4->tmr_real_task = NULL;
+                        /* Kill itimer */
+                        killitimer();
                     }
 
                     char break_string[80];
@@ -108,10 +82,8 @@ raise(int sig) {
                        land us in _exit(). */
                     __abort();
                 }
-                /* If we have a SIGALRM without associated handler don't call abort but exit directly */
+                /* If we have a SIGALRM without associated handler send the SIGBREAKF_CTRL_E signal */
                 if (sig == SIGALRM) {
-                    __print_termination_message("Alarm Clock");
-
                     /* Block SIGALRM signal from raise again */
                     sigblock(SIGALRM);
 

diff --git a/library/resolv/lookup_name.c b/library/resolv/lookup_name.c
@@ -147,7 +147,7 @@ static int name_from_dns(struct address buf[static MAXADDRS], char canon[static
     int qlens[2], alens[2];
     int i, nq = 0;
     struct dpc_ctx ctx = {.addrs = buf, .canon = canon};
-    static const struct {
+    const struct {
         int af;
         int rr;
     } afrr[2] = {

diff --git a/library/resolv/res_state.c b/library/resolv/res_state.c
@@ -1,11 +1,11 @@
 /* $Id: socket_res_state.c,v 1.0 2022-03-14 10:44:15 clib4devs Exp $
  */
 
+#include <dos.h>
 #include <resolv.h>
 
 /* This is completely unused, and exists purely to satisfy broken apps. */
-
 struct __res_state *__res_state() {
-    static struct __res_state res;
-    return &res;
+    struct _clib4 *__clib4 = __CLIB4;
+    return &__clib4->_res_state;
 }
diff --git a/library/stdio/lock.c b/library/stdio/lock.c
@@ -8,16 +8,12 @@
 
 void
 __stdio_lock(struct _clib4 *__clib4) {
-    assert(__clib4->stdio_lock != NULL);
-
     if (__clib4->stdio_lock != NULL)
         ObtainSemaphore(__clib4->stdio_lock);
 }
 
 void
 __stdio_unlock(struct _clib4 *__clib4) {
-    assert(__clib4->stdio_lock != NULL);
-
     if (__clib4->stdio_lock != NULL)
         ReleaseSemaphore(__clib4->stdio_lock);
 }

diff --git a/library/stdlib/exit.c b/library/stdlib/exit.c
@@ -10,19 +10,11 @@
 #include "stdio_headers.h"
 #endif /* _STDIO_HEADERS_H */
 
-#include "pthread/common.h"
-
-static APTR
-hook_function(struct Hook *hook, APTR userdata, struct Process *process) {
-    uint32 pid = (uint32) userdata;
-    (void) (hook);
-
-    if (process->pr_ProcessID == pid) {
-        return process;
-    }
+#ifndef _UNISTD_HEADERS_H
+#include "unistd_headers.h"
+#endif /* _UNISTD_HEADERS_H */
 
-    return 0;
-}
+#include "pthread/common.h"
 
 void
 _exit(int return_code) {
@@ -46,26 +38,10 @@ _exit(int return_code) {
         SHOWMSG("IN MAIN TASK");
         /*  If we have a previous timer running task stop it before raise SIGINT  */
         if (__clib4->tmr_real_task) {
-            struct Hook h = {{NULL, NULL}, (HOOKFUNC) hook_function, NULL, NULL};
-            int32 pid, process;
-
             /* Block SIGALRM signal from raise */
             sigblock(SIGALRM);
-            /* Get itimer process ID */
-            pid = __clib4->tmr_real_task->pr_ProcessID;
-
-            Forbid();
-            /* Scan for process */
-            process = ProcessScan(&h, (CONST_APTR) pid, 0);
-            while (process > 0) {
-                /* Send a SIGBREAKF_CTRL_F signal until the timer task return in Wait and can get the signal */
-                Signal((struct Task *) __clib4->tmr_real_task, SIGBREAKF_CTRL_F);
-                process = ProcessScan(&h, (CONST_APTR) pid, 0);
-                usleep(100);
-            }
-            Permit();
-            WaitForChildExit(pid);
-            __clib4->tmr_real_task = NULL;
+            /* Kill itimer */
+            killitimer();
         }
 
         /* Dump all currently unwritten data, especially to the console. */

diff --git a/library/time/itimer_tasks.c b/library/time/itimer_tasks.c
@@ -125,8 +125,10 @@ int itimer_real_task() {
 
 out:
     /* Free itimer objects */
-    SHOWMSG("FreeSysObject ASOT_PORT");
-    FreeSysObject(ASOT_PORT, tmr_real_mp);
+    if (tmr_real_mp) {
+        SHOWMSG("FreeSysObject ASOT_PORT");
+        FreeSysObject(ASOT_PORT, tmr_real_mp);
+    }
 
     if (tmr_real_tr) {
         if (tmr_real_tr->Request.io_Device != NULL) {

diff --git a/library/time/setitimer.c b/library/time/setitimer.c
@@ -11,6 +11,36 @@
 #include "time_headers.h"
 #endif /* _TIME_HEADERS_H */
 
+static APTR
+hook_function(struct Hook *hook, APTR userdata, struct Process *process) {
+    uint32 pid = (uint32) userdata;
+    (void) (hook);
+
+    if (process->pr_ProcessID == pid) {
+        return process;
+    }
+
+    return 0;
+}
+
+void killitimer(void) {
+    struct _clib4 *__clib4 = __CLIB4;
+    struct Hook h = {{NULL, NULL}, (HOOKFUNC) hook_function, NULL, NULL};
+    int32 pid, process;
+    pid = __clib4->tmr_real_task->pr_ProcessID;
+    /* Scan for process */
+    process = ProcessScan(&h, (CONST_APTR) pid, 0);
+    while (process > 0) {
+        /* Send a SIGBREAKF_CTRL_F signal until the timer task return in Wait and can get the signal */
+        Signal((struct Task *) __clib4->tmr_real_task, SIGBREAKF_CTRL_F);
+        process = ProcessScan(&h, (CONST_APTR) pid, 0);
+        Delay(10);
+    }
+    WaitForChildExit(pid);
+    __clib4->tmr_real_task = NULL;
+
+};
+
 int
 setitimer(int which, const struct itimerval *new_value, struct itimerval *old_value) {
     ENTER();
@@ -50,7 +80,7 @@ setitimer(int which, const struct itimerval *new_value, struct itimerval *old_va
             }
             else if (__clib4->tmr_real_task == NULL) {
                 /* Create timer tasks */
-                if ((new_value->it_value.tv_sec != 0 || new_value->it_value.tv_usec != 0)) {
+                if (new_value->it_value.tv_sec != 0 || new_value->it_value.tv_usec != 0) {
                     __clib4->tmr_real_task = CreateNewProcTags(
                             NP_Name, "ITIMER_TASK",
                             NP_Entry, itimer_real_task,
@@ -66,9 +96,10 @@ setitimer(int which, const struct itimerval *new_value, struct itimerval *old_va
                 }
             }
             else {
-                int pid = __clib4->tmr_real_task->pr_ProcessID;
-                Signal((struct Task *)__clib4->tmr_real_task, SIGBREAKF_CTRL_F);
-                WaitForChildExit(pid);
+                /* Block SIGALRM signal from raise */
+                sigblock(SIGALRM);
+                /* Kill itimer */
+                killitimer();
             }
 
             break;

diff --git a/library/unistd/unistd_headers.h b/library/unistd/unistd_headers.h
@@ -18,5 +18,6 @@ extern int __strip_double_slash(char * file_name,int len);
 extern int __time_delay(ULONG timercmd, struct timeval *tv);
 extern long __pathconf(struct MsgPort *port,int name);
 extern int itimer_real_task(void);
+extern void killitimer(void);
 
 #endif /* _UNISTD_HEADERS_H */
diff --git a/library/usergroup/usergroup_headers.h b/library/usergroup/usergroup_headers.h
@@ -30,7 +30,7 @@
 	struct UserGroupIFace 	*IUserGroup	    = __CLIB4->__IUserGroup
 
 
-#ifndef _PATH_SERVICES
+#ifndef _PATH_USERS
 #define _PATH_USERS  "Devs:Internet/users"
 #endif