From: Rich Felker <dalias@aerifal.cx>
Date: Wed, 30 Mar 2011 02:43:13 +0000 (-0400)
Subject: reorder timer initialization so that timer_create does not depend on free
X-Git-Tag: v0.7.5~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=680630011d38eb9f96f92b2f080cc60f38f6df21;p=oweals%2Fmusl.git

reorder timer initialization so that timer_create does not depend on free

this allows small programs which only create times, but never delete
them, to use simple_malloc instead of the full malloc.
---

diff --git a/src/time/timer_create.c b/src/time/timer_create.c
index 1ac1906b..2abec278 100644
--- a/src/time/timer_create.c
+++ b/src/time/timer_create.c
@@ -61,21 +61,28 @@ int timer_create(clockid_t clk, struct sigevent *evp, timer_t *res)
 	struct start_args args;
 	timer_t t;
 	struct ksigevent ksev;
+	int timerid;
 
 	if (evp) sev = *evp;
 
 	switch (sev.sigev_notify) {
 	case SIGEV_NONE:
 	case SIGEV_SIGNAL:
-		if (!(t = calloc(1, sizeof *t)))
-			return -1;
 		ksev.sigev_value = evp ? sev.sigev_value
 			: (union sigval){.sival_ptr=t};
 		ksev.sigev_signo = sev.sigev_signo;
 		ksev.sigev_notify = sev.sigev_notify;
 		ksev.sigev_tid = 0;
+		if (syscall(SYS_timer_create, clk, &ksev, &timerid) < 0)
+			return -1;
+		if (!(t = calloc(1, sizeof *t))) {
+			syscall(SYS_timer_delete, timerid);
+			return -1;
+		}
+		t->timerid = timerid;
 		break;
 	case SIGEV_THREAD:
+		if (!libc.sigtimer) libc.sigtimer = sighandler;
 		if (sev.sigev_notify_attributes)
 			attr = *sev.sigev_notify_attributes;
 		else
@@ -95,13 +102,14 @@ int timer_create(clockid_t clk, struct sigevent *evp, timer_t *res)
 		ksev.sigev_signo = SIGCANCEL;
 		ksev.sigev_notify = 4; /* SIGEV_THREAD_ID */
 		ksev.sigev_tid = td->tid;
-		if (!libc.sigtimer) libc.sigtimer = sighandler;
+		if (syscall(SYS_timer_create, clk, &ksev, &t->timerid) < 0) {
+			t->timerid = -1;
+			pthread_cancel(td);
+			return -1;
+		}
 		break;
-	}
-
-	t->timerid = -1;
-	if (syscall(SYS_timer_create, clk, &ksev, &t->timerid) < 0) {
-		timer_delete(t);
+	default:
+		errno = EINVAL;
 		return -1;
 	}
 
diff --git a/src/time/timer_delete.c b/src/time/timer_delete.c
index d7c7670f..caf04895 100644
--- a/src/time/timer_delete.c
+++ b/src/time/timer_delete.c
@@ -5,7 +5,7 @@ int timer_delete(timer_t t)
 {
 	if (t->thread) pthread_cancel(t->thread);
 	else {
-		if (t->timerid >= 0) __syscall(SYS_timer_delete, t->timerid);
+		__syscall(SYS_timer_delete, t->timerid);
 		free(t);
 	}
 	return 0;