[v2,11/16] Add SYSV semaphore test
Commit Message
Changes from previous version:
- Use __ASSUME_SYSVIPC_SYSCALL instead of __NR_syscall to issue the
wired syscall or the ipc one.
--
This patch adds a simple SYSV semaphore test to check for correct
argument passing on kernel. The idea is neither to be an extensive
testing nor to check for any specific Linux test.
* sysvipc/Makefile (tests): Add test-sysvsem.
* sysvipc/test-sysvsem.c: New file.
---
ChangeLog | 3 ++
sysvipc/Makefile | 2 +-
sysvipc/test-sysvsem.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 119 insertions(+), 1 deletion(-)
create mode 100644 sysvipc/test-sysvsem.c
Comments
On Wed, Nov 02, 2016 at 05:26:48PM -0200, Adhemerval Zanella wrote:
> Changes from previous version:
>
> - Use __ASSUME_SYSVIPC_SYSCALL instead of __NR_syscall to issue the
> wired syscall or the ipc one.
>
> --
>
> This patch adds a simple SYSV semaphore test to check for correct
> argument passing on kernel. The idea is neither to be an extensive
> testing nor to check for any specific Linux test.
>
> * sysvipc/Makefile (tests): Add test-sysvsem.
> * sysvipc/test-sysvsem.c: New file.
> ---
> ChangeLog | 3 ++
> sysvipc/Makefile | 2 +-
> sysvipc/test-sysvsem.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 119 insertions(+), 1 deletion(-)
> create mode 100644 sysvipc/test-sysvsem.c
>
> diff --git a/sysvipc/Makefile b/sysvipc/Makefile
> index 73bb9cf..32d64dc 100644
> --- a/sysvipc/Makefile
> +++ b/sysvipc/Makefile
> @@ -30,7 +30,7 @@ routines := ftok \
> semop semget semctl semtimedop \
> shmat shmdt shmget shmctl
>
> -tests := test-sysvmsg
> +tests := test-sysvmsg test-sysvsem
>
> include ../Rules
>
> diff --git a/sysvipc/test-sysvsem.c b/sysvipc/test-sysvsem.c
> new file mode 100644
> index 0000000..178a424
> --- /dev/null
> +++ b/sysvipc/test-sysvsem.c
> @@ -0,0 +1,115 @@
> +/* Basic tests for SYSV semaphore functions.
> + Copyright (C) 2016 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <http://www.gnu.org/licenses/>. */
> +
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <errno.h>
> +#include <string.h>
> +#include <sys/types.h>
> +#include <sys/ipc.h>
> +#include <sys/sem.h>
> +
> +static void do_prepare (void);
> +#define PREPARE(argc, argv) do_prepare ()
> +static int do_test (void);
> +#define TEST_FUNCTION do_test ()
> +
> +/* This defines the `main' function and some more. */
> +#include <test-skeleton.c>
> +
> +/* These are for the temporary file we generate. */
> +static char *name;
> +static int semid;
> +
> +static void
> +remove_sem (void)
> +{
> + /* Enforce message queue removal in case o early test failure.
Trailing whitespace
> + Ignore error since the msgq maybe already being removed. */
> + semctl (semid, 0, IPC_RMID, 0);
> +}
> +
> +static void
> +do_prepare (void)
> +{
> + int fd = create_temp_file ("tst-sysvsem.", &name);
> + if (fd == -1)
> + FAIL_EXIT1 ("cannot create temporary file (errno=%d)", errno);
> +}
> +
> +/* It is not an extensive test, but rather a functional one aimed to check
> + correct parameter passing on kernel. */
> +
> +#define SEM_MODE 0644
> +
> +static int
> +do_test (void)
> +{
> + atexit (remove_sem);
> +
> + key_t key = ftok (name, 'G');
> + if (key == -1)
> + FAIL_EXIT1 ("ftok failed");
> +
> + semid = semget(key, 1, IPC_CREAT | IPC_EXCL | SEM_MODE);
> + if (semid == -1)
> + {
> + if (errno == ENOSYS)
> + FAIL_UNSUPPORTED ("msgget not supported");
> + FAIL_EXIT1 ("msgget failed (errno=%d)", errno);
> + }
> +
> + /* Get semaphore kernel information and do some sanitiy checks. */
> + struct semid_ds seminfo;
> + if (semctl (semid, 0, IPC_STAT, &seminfo) == -1)
> + FAIL_EXIT1 ("msgctl with IPC_STAT failed (errno=%d)", errno);
> +
> + if (seminfo.sem_perm.__key != key)
> + FAIL_EXIT1 ("msgid_ds::sem_perm::key (%d) != %d",
> + (int) seminfo.sem_perm.__key, (int) key);
> + if (seminfo.sem_perm.mode != SEM_MODE)
> + FAIL_EXIT1 ("msgid_ds::sem_perm::mode (%o) != %o",
> + seminfo.sem_perm.mode, SEM_MODE);
> + if (seminfo.sem_nsems != 1)
> + FAIL_EXIT1 ("msgid_ds::sem_nsems (%lu) != 1",
> + (long unsigned) seminfo.sem_nsems);
> +
> + /* Some lock/unlock basic tests. */
> + struct sembuf sb1 = { 0, 1, 0 };
> + if (semop (semid, &sb1, 1) == -1)
> + FAIL_EXIT1 ("semop failed (errno=%i)", errno);
> +
> + struct sembuf sb2 = { 0, -1, 0 };
> + if (semop (semid, &sb2, 1) == -1)
> + FAIL_EXIT1 ("semop failed (errno=%i)", errno);
> +
> +#ifdef _GNU_SOURCE
> + /* Set a time for half a second. The semaphore operation should timeout
> + with EAGAIN. */
> + struct timespec ts = { 0 /* sec */, 500000000 /* nsec */ };
> + if (semtimedop (semid, &sb2, 1, &ts) != -1 || errno != EAGAIN)
> + FAIL_EXIT1 ("semtimedop succeed or returned errno != EAGAIN (errno=%i)",
> + errno);
> +#endif
> +
> + /* Finally free up the semnaphore resource. */
> + if (semctl (semid, 0, IPC_RMID, 0) == -1)
> + FAIL_EXIT1 ("semctl failed (errno=%d)", errno);
> +
> + return 0;
> +}
> --
> 2.7.4
On 03/11/2016 15:10, Yury Norov wrote:
>> diff --git a/sysvipc/test-sysvsem.c b/sysvipc/test-sysvsem.c
>> new file mode 100644
>> index 0000000..178a424
>> --- /dev/null
>> +++ b/sysvipc/test-sysvsem.c
>> @@ -0,0 +1,115 @@
>> +/* Basic tests for SYSV semaphore functions.
>> + Copyright (C) 2016 Free Software Foundation, Inc.
>> + This file is part of the GNU C Library.
>> +
>> + The GNU C Library is free software; you can redistribute it and/or
>> + modify it under the terms of the GNU Lesser General Public
>> + License as published by the Free Software Foundation; either
>> + version 2.1 of the License, or (at your option) any later version.
>> +
>> + The GNU C Library is distributed in the hope that it will be useful,
>> + but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>> + Lesser General Public License for more details.
>> +
>> + You should have received a copy of the GNU Lesser General Public
>> + License along with the GNU C Library; if not, see
>> + <http://www.gnu.org/licenses/>. */
>> +
>> +#include <stdio.h>
>> +#include <stdlib.h>
>> +#include <errno.h>
>> +#include <string.h>
>> +#include <sys/types.h>
>> +#include <sys/ipc.h>
>> +#include <sys/sem.h>
>> +
>> +static void do_prepare (void);
>> +#define PREPARE(argc, argv) do_prepare ()
>> +static int do_test (void);
>> +#define TEST_FUNCTION do_test ()
>> +
>> +/* This defines the `main' function and some more. */
>> +#include <test-skeleton.c>
>> +
>> +/* These are for the temporary file we generate. */
>> +static char *name;
>> +static int semid;
>> +
>> +static void
>> +remove_sem (void)
>> +{
>> + /* Enforce message queue removal in case o early test failure.
>
> Trailing whitespace
Ack, I fixed in my local branch.
@@ -30,7 +30,7 @@ routines := ftok \
semop semget semctl semtimedop \
shmat shmdt shmget shmctl
-tests := test-sysvmsg
+tests := test-sysvmsg test-sysvsem
include ../Rules
new file mode 100644
@@ -0,0 +1,115 @@
+/* Basic tests for SYSV semaphore functions.
+ Copyright (C) 2016 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/sem.h>
+
+static void do_prepare (void);
+#define PREPARE(argc, argv) do_prepare ()
+static int do_test (void);
+#define TEST_FUNCTION do_test ()
+
+/* This defines the `main' function and some more. */
+#include <test-skeleton.c>
+
+/* These are for the temporary file we generate. */
+static char *name;
+static int semid;
+
+static void
+remove_sem (void)
+{
+ /* Enforce message queue removal in case o early test failure.
+ Ignore error since the msgq maybe already being removed. */
+ semctl (semid, 0, IPC_RMID, 0);
+}
+
+static void
+do_prepare (void)
+{
+ int fd = create_temp_file ("tst-sysvsem.", &name);
+ if (fd == -1)
+ FAIL_EXIT1 ("cannot create temporary file (errno=%d)", errno);
+}
+
+/* It is not an extensive test, but rather a functional one aimed to check
+ correct parameter passing on kernel. */
+
+#define SEM_MODE 0644
+
+static int
+do_test (void)
+{
+ atexit (remove_sem);
+
+ key_t key = ftok (name, 'G');
+ if (key == -1)
+ FAIL_EXIT1 ("ftok failed");
+
+ semid = semget(key, 1, IPC_CREAT | IPC_EXCL | SEM_MODE);
+ if (semid == -1)
+ {
+ if (errno == ENOSYS)
+ FAIL_UNSUPPORTED ("msgget not supported");
+ FAIL_EXIT1 ("msgget failed (errno=%d)", errno);
+ }
+
+ /* Get semaphore kernel information and do some sanitiy checks. */
+ struct semid_ds seminfo;
+ if (semctl (semid, 0, IPC_STAT, &seminfo) == -1)
+ FAIL_EXIT1 ("msgctl with IPC_STAT failed (errno=%d)", errno);
+
+ if (seminfo.sem_perm.__key != key)
+ FAIL_EXIT1 ("msgid_ds::sem_perm::key (%d) != %d",
+ (int) seminfo.sem_perm.__key, (int) key);
+ if (seminfo.sem_perm.mode != SEM_MODE)
+ FAIL_EXIT1 ("msgid_ds::sem_perm::mode (%o) != %o",
+ seminfo.sem_perm.mode, SEM_MODE);
+ if (seminfo.sem_nsems != 1)
+ FAIL_EXIT1 ("msgid_ds::sem_nsems (%lu) != 1",
+ (long unsigned) seminfo.sem_nsems);
+
+ /* Some lock/unlock basic tests. */
+ struct sembuf sb1 = { 0, 1, 0 };
+ if (semop (semid, &sb1, 1) == -1)
+ FAIL_EXIT1 ("semop failed (errno=%i)", errno);
+
+ struct sembuf sb2 = { 0, -1, 0 };
+ if (semop (semid, &sb2, 1) == -1)
+ FAIL_EXIT1 ("semop failed (errno=%i)", errno);
+
+#ifdef _GNU_SOURCE
+ /* Set a time for half a second. The semaphore operation should timeout
+ with EAGAIN. */
+ struct timespec ts = { 0 /* sec */, 500000000 /* nsec */ };
+ if (semtimedop (semid, &sb2, 1, &ts) != -1 || errno != EAGAIN)
+ FAIL_EXIT1 ("semtimedop succeed or returned errno != EAGAIN (errno=%i)",
+ errno);
+#endif
+
+ /* Finally free up the semnaphore resource. */
+ if (semctl (semid, 0, IPC_RMID, 0) == -1)
+ FAIL_EXIT1 ("semctl failed (errno=%d)", errno);
+
+ return 0;
+}