projects
/
libc-test
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add missing unistd.h include
[libc-test]
/
src
/
functional
/
pthread_cancel-points.c
diff --git
a/src/functional/pthread_cancel-points.c
b/src/functional/pthread_cancel-points.c
index
2c12ed6
..
8b169a0
100644
(file)
--- a/
src/functional/pthread_cancel-points.c
+++ b/
src/functional/pthread_cancel-points.c
@@
-4,6
+4,8
@@
#include <semaphore.h>
#include <string.h>
#include <sys/mman.h>
#include <semaphore.h>
#include <string.h>
#include <sys/mman.h>
+#include <fcntl.h>
+#include <unistd.h>
#include "test.h"
#define TESTC(c, m) ( (c) || (t_error(#c " failed (%s, " m ")\n", cdescr), 0) )
#include "test.h"
#define TESTC(c, m) ( (c) || (t_error(#c " failed (%s, " m ")\n", cdescr), 0) )
@@
-25,7
+27,6
@@
static void prepare_sem(void *arg)
static void cleanup_sem(void *arg)
{
static void cleanup_sem(void *arg)
{
- TESTR(sem_post(&sem_test), "posting semaphore");
TESTR(sem_destroy(&sem_test), "destroying semaphore");
}
TESTR(sem_destroy(&sem_test), "destroying semaphore");
}
@@
-59,11
+60,12
@@
static void prepare_thread(void *arg)
static void cleanup_thread(void *arg)
{
void *res;
static void cleanup_thread(void *arg)
{
void *res;
+ if (td_test) {
+ TESTR(sem_post(&sem_test), "posting semaphore");
+ TESTR(pthread_join(td_test, &res), "joining auxiliary thread");
+ TESTC(res == 0, "auxiliary thread exit status");
+ }
cleanup_sem(arg);
cleanup_sem(arg);
- if (!td_test)
- return;
- TESTR(pthread_join(td_test, &res), "joining auxiliary thread");
- TESTC(res == 0, "auxiliary thread exit status");
}
static void execute_thread_join(void *arg)
}
static void execute_thread_join(void *arg)
@@
-85,8
+87,10
@@
static void execute_shm_open(void *arg)
static void cleanup_shm(void *arg)
{
int *fd = arg;
static void cleanup_shm(void *arg)
{
int *fd = arg;
- TESTE(close(*fd), "shm fd");
- TESTE(shm_unlink("/testshm"), "");
+ if (*fd > 0) {
+ TESTE(close(*fd), "shm fd");
+ TESTE(shm_unlink("/testshm"), "");
+ }
}
static struct {
}
static struct {