Move semaphore/ tests to semop/
PATCH 1/1 Move semaphore/ tests to semop/
There is no point in having two different directories with semop() testcaes so it would make sense to move these two tests into the syscalls/ipc/semop/ directory as semop04 and semop05. So we move ipc/semaphore/ tests to syscalls/ipc/semop/. Also update runtest files accordingly.
---
runtest/syscalls | 2 ++
testcases/kernel/ipc/semaphore/.gitignore | 2 --
testcases/kernel/ipc/semaphore/Makefile | 30 -------------------
.../kernel/syscalls/ipc/semop/.gitignore | 2 ++
testcases/kernel/syscalls/ipc/semop/Makefile | 1 +
.../sem01.c => syscalls/ipc/semop/semop04.c} | 0
.../sem02.c => syscalls/ipc/semop/semop05.c} | 0
7 files changed, 5 insertions(+), 32 deletions(-)
delete mode 100644 testcases/kernel/ipc/semaphore/.gitignore
delete mode 100644 testcases/kernel/ipc/semaphore/Makefile
rename testcases/kernel/{ipc/semaphore/sem01.c => syscalls/ipc/semop/semop04.c} (100%)
rename testcases/kernel/{ipc/semaphore/sem02.c => syscalls/ipc/semop/semop05.c} (100%)runtest/syscalls +2 -0
@@ -1239,6 +1239,8 @@ semget06 semget06 semop01 semop01 semop02 semop02 semop03 semop03 +semop04 semop04 +semop05 semop05 send01 send01 send02 send02
testcases/kernel/ipc/semaphore/.gitignore deleted +0 -2
@@ -1,2 +0,0 @@ -/sem01 -/sem02
testcases/kernel/ipc/semaphore/Makefile deleted +0 -30
@@ -1,30 +0,0 @@ -# -# testcases/kernel/ipc/semaphore Makefile. -# -# Copyright (C) 2009, Cisco Systems Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Ngie Cooper, July 2009 -# - -top_srcdir ?= ../../../.. - -include $(top_srcdir)/include/mk/testcases.mk - -CPPFLAGS += -I../include -LDLIBS += -lpthread - -include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/semop/.gitignore +2 -0
@@ -1,3 +1,5 @@ /semop01 /semop02 /semop03 +/semop04 +/semop05
testcases/kernel/syscalls/ipc/semop/Makefile +1 -0
@@ -8,5 +8,6 @@ LTPLIBS = ltpnewipc include $(top_srcdir)/include/mk/testcases.mk LTPLDLIBS = -lltpnewipc +LDLIBS += -lpthread include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/semop/semop04.c renamed from testcases/kernel/ipc/semaphore/sem01.c +0 -0
testcases/kernel/syscalls/ipc/semop/semop05.c renamed from testcases/kernel/ipc/semaphore/sem02.c +0 -0
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Wei,
Quoted 5 lines
There is no point in having two different directories with
semop()testcaes so it would make sense to move these two tests into the syscalls/ipc/semop/ directory as semop04 and semop05. So we moveipc/semaphore/tests to syscalls/ipc/semop/. Also update runtest files accordingly.
testcases/kernel/ipc/semaphore/Makefile
links with libpthread.so.0:
LDLIBS += -lpthread
Although it looks like only sem02.c uses pthread functions.
https://man7.org/linux/man-pages/man7/pthreads.7.html
testcases/kernel/syscalls/ipc/semop/Makefile
links with ltp library libltpnewipc.a:
LTPLDLIBS = -lltpnewipc
which uses /proc/sysvipc/
https://man7.org/linux/man-pages/man7/sysvipc.7.html
I'm not sure if it's good idea to mix both
@Cyril any input?
testcases/kernel/syscalls/ipc/semop/Makefile LTPLIBS = ltpnewipc · line 11
Quoted 6 lines
+++ b/testcases/kernel/syscalls/ipc/semop/Makefile
testcases/kernel/syscalls/ipc/semop/Makefile +1
-0@@ -8,5 +8,6 @@ LTPLIBS = ltpnewipc include $(top_srcdir)/include/mk/testcases.mk LTPLDLIBS = -lltpnewipc +LDLIBS += -lpthread
If it's ok to merge them into single directory, it'd be better to specify used libraries for files which need them. e.g.:
semop01: LTPLDLIBS = -lltpnewipc
semop02: LTPLDLIBS = -lltpnewipc
semop03: LTPLDLIBS = -lltpnewipc
semop05: LDLIBS += -lpthread
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 1/1 Move semaphore/ tests to semop/
In reply to Wei Gao via ltpThere is no point in having two different directories with semop() testcaes so it would make sense to move these two tests into the syscalls/ipc/semop/ directory as semop04 and semop05. So we move ipc/semaphore/ tests to syscalls/ipc/semop/. Also update runtest files accordingly.
---
v2->v1:Update Makefile give each case specific link option
runtest/syscalls | 2 ++
testcases/kernel/ipc/semaphore/.gitignore | 2 --
testcases/kernel/ipc/semaphore/Makefile | 30 -------------------
.../kernel/syscalls/ipc/semop/.gitignore | 2 ++
testcases/kernel/syscalls/ipc/semop/Makefile | 5 +++-
.../sem01.c => syscalls/ipc/semop/semop04.c} | 0
.../sem02.c => syscalls/ipc/semop/semop05.c} | 0
7 files changed, 8 insertions(+), 33 deletions(-)
delete mode 100644 testcases/kernel/ipc/semaphore/.gitignore
delete mode 100644 testcases/kernel/ipc/semaphore/Makefile
rename testcases/kernel/{ipc/semaphore/sem01.c => syscalls/ipc/semop/semop04.c} (100%)
rename testcases/kernel/{ipc/semaphore/sem02.c => syscalls/ipc/semop/semop05.c} (100%)runtest/syscalls +2 -0
@@ -1239,6 +1239,8 @@ semget06 semget06 semop01 semop01 semop02 semop02 semop03 semop03 +semop04 semop04 +semop05 semop05 send01 send01 send02 send02
testcases/kernel/ipc/semaphore/.gitignore deleted +0 -2
@@ -1,2 +0,0 @@ -/sem01 -/sem02
testcases/kernel/ipc/semaphore/Makefile deleted +0 -30
@@ -1,30 +0,0 @@ -# -# testcases/kernel/ipc/semaphore Makefile. -# -# Copyright (C) 2009, Cisco Systems Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Ngie Cooper, July 2009 -# - -top_srcdir ?= ../../../.. - -include $(top_srcdir)/include/mk/testcases.mk - -CPPFLAGS += -I../include -LDLIBS += -lpthread - -include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/semop/.gitignore +2 -0
@@ -1,3 +1,5 @@ /semop01 /semop02 /semop03 +/semop04 +/semop05
testcases/kernel/syscalls/ipc/semop/Makefile +4 -1
@@ -7,6 +7,9 @@ LTPLIBS = ltpnewipc include $(top_srcdir)/include/mk/testcases.mk -LTPLDLIBS = -lltpnewipc +semop01: LTPLDLIBS = -lltpnewipc +semop02: LTPLDLIBS = -lltpnewipc +semop03: LTPLDLIBS = -lltpnewipc +semop05: LDLIBS += -lpthread include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/semop/semop04.c renamed from testcases/kernel/ipc/semaphore/sem01.c +0 -0
testcases/kernel/syscalls/ipc/semop/semop05.c renamed from testcases/kernel/ipc/semaphore/sem02.c +0 -0
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hello,
Quoted 5 lines · Wei Gao via ltp
There is no point in having two different directories with
semop()testcaes so it would make sense to move these two tests into the syscalls/ipc/semop/ directory as semop04 and semop05. So we moveipc/semaphore/tests to syscalls/ipc/semop/. Also update runtest files accordingly.
Yes, true. However these tests are using the old API. It makes sense to move them and update to the new API at the same time. Maybe they even test the same things as the other tests, so they could be deduplicated.
I like breaking things into small tasks, but this is actually too small. I think it would be better to convert and move one test at a time as well (in separate commits, but in the same patch series).
Signature · 5 lines
Thank you, Richard. -- Mailing list info: https://lists.linux.it/listinfo/ltp
v3 cover Refactor semaphore
In reply to Wei Gao via ltpWei Gao (2):
Move semaphore/ tests to semop/
semop04:Refactor with new API
runtest/syscalls | 2 +
testcases/kernel/ipc/semaphore/.gitignore | 2 -
testcases/kernel/ipc/semaphore/Makefile | 30 ----
testcases/kernel/ipc/semaphore/sem01.c | 164 ------------------
.../kernel/syscalls/ipc/semop/.gitignore | 2 +
testcases/kernel/syscalls/ipc/semop/Makefile | 5 +-
testcases/kernel/syscalls/ipc/semop/semop04.c | 137 +++++++++++++++
.../sem02.c => syscalls/ipc/semop/semop05.c} | 0
8 files changed, 145 insertions(+), 197 deletions(-)
delete mode 100644 testcases/kernel/ipc/semaphore/.gitignore
delete mode 100644 testcases/kernel/ipc/semaphore/Makefile
delete mode 100644 testcases/kernel/ipc/semaphore/sem01.c
create mode 100644 testcases/kernel/syscalls/ipc/semop/semop04.c
rename testcases/kernel/{ipc/semaphore/sem02.c => syscalls/ipc/semop/semop05.c} (100%)Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 1/2 Move semaphore/ tests to semop/
There is no point in having two different directories with semop() testcaes so it would make sense to move these two tests into the syscalls/ipc/semop/ directory as semop04 and semop05. So we move ipc/semaphore/ tests to syscalls/ipc/semop/. Also update runtest files accordingly.
---
runtest/syscalls | 2 ++
testcases/kernel/ipc/semaphore/.gitignore | 2 --
testcases/kernel/ipc/semaphore/Makefile | 30 -------------------
.../kernel/syscalls/ipc/semop/.gitignore | 2 ++
testcases/kernel/syscalls/ipc/semop/Makefile | 5 +++-
.../sem01.c => syscalls/ipc/semop/semop04.c} | 0
.../sem02.c => syscalls/ipc/semop/semop05.c} | 0
7 files changed, 8 insertions(+), 33 deletions(-)
delete mode 100644 testcases/kernel/ipc/semaphore/.gitignore
delete mode 100644 testcases/kernel/ipc/semaphore/Makefile
rename testcases/kernel/{ipc/semaphore/sem01.c => syscalls/ipc/semop/semop04.c} (100%)
rename testcases/kernel/{ipc/semaphore/sem02.c => syscalls/ipc/semop/semop05.c} (100%)runtest/syscalls +2 -0
@@ -1239,6 +1239,8 @@ semget06 semget06 semop01 semop01 semop02 semop02 semop03 semop03 +semop04 semop04 +semop05 semop05 send01 send01 send02 send02
testcases/kernel/ipc/semaphore/.gitignore deleted +0 -2
@@ -1,2 +0,0 @@ -/sem01 -/sem02
testcases/kernel/ipc/semaphore/Makefile deleted +0 -30
@@ -1,30 +0,0 @@ -# -# testcases/kernel/ipc/semaphore Makefile. -# -# Copyright (C) 2009, Cisco Systems Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Ngie Cooper, July 2009 -# - -top_srcdir ?= ../../../.. - -include $(top_srcdir)/include/mk/testcases.mk - -CPPFLAGS += -I../include -LDLIBS += -lpthread - -include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/semop/.gitignore +2 -0
@@ -1,3 +1,5 @@ /semop01 /semop02 /semop03 +/semop04 +/semop05
testcases/kernel/syscalls/ipc/semop/Makefile +4 -1
@@ -7,6 +7,9 @@ LTPLIBS = ltpnewipc include $(top_srcdir)/include/mk/testcases.mk -LTPLDLIBS = -lltpnewipc +semop01: LTPLDLIBS = -lltpnewipc +semop02: LTPLDLIBS = -lltpnewipc +semop03: LTPLDLIBS = -lltpnewipc +semop05: LDLIBS += -lpthread include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/semop/semop04.c renamed from testcases/kernel/ipc/semaphore/sem01.c +0 -0
testcases/kernel/syscalls/ipc/semop/semop05.c renamed from testcases/kernel/ipc/semaphore/sem02.c +0 -0
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Wei,
Quoted 5 lines
There is no point in having two different directories with
semop()testcaes so it would make sense to move these two tests into the syscalls/ipc/semop/ directory as semop04 and semop05. So we moveipc/semaphore/tests to syscalls/ipc/semop/. Also update runtest files accordingly.
As I already stated, I'm not really sure this is good to do, but maybe I'm missing something. I wonder what others thing about it.
...
runtest/syscalls semget06 semget06 · line 1243
Quoted 10 lines
rename testcases/kernel/{ipc/semaphore/sem01.c => syscalls/ipc/semop/semop04.c} (100%) rename testcases/kernel/{ipc/semaphore/sem02.c => syscalls/ipc/semop/semop05.c} (100%)+++ b/runtest/syscalls
runtest/syscalls +2
-0@@ -1239,6 +1239,8 @@ semget06 semget06 semop01 semop01 semop02 semop02 semop03 semop03 +semop04 semop04 +semop05 semop05
You renamed files, you need to remove sem01 sem02 from runtest/ipc.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 11 lines · Petr Vorel
Hi Wei,
Quoted 5 lines
There is no point in having two different directories with
semop()testcaes so it would make sense to move these two tests into the syscalls/ipc/semop/ directory as semop04 and semop05. So we moveipc/semaphore/tests to syscalls/ipc/semop/. Also update runtest files accordingly.As I already stated, I'm not really sure this is good to do, but maybe I'm missing something. I wonder what others thing about it.
Ah, you also start work on this? Should i still continue work on this patch or not? To me this is not bad thing at least, we do some clean work and reorganize the test cases.
Quoted 4 lines
...
Quoted 2 lines
rename testcases/kernel/{ipc/semaphore/sem01.c => syscalls/ipc/semop/semop04.c} (100%) rename testcases/kernel/{ipc/semaphore/sem02.c => syscalls/ipc/semop/semop05.c} (100%)
Quoted 8 lines
runtest/syscalls semget06 semget06 · line 1243
Quoted 7 lines
+++ b/runtest/syscalls
runtest/syscalls +2
-0@@ -1239,6 +1239,8 @@ semget06 semget06 semop01 semop01 semop02 semop02 semop03 semop03 +semop04 semop04 +semop05 semop05You renamed files, you need to remove sem01 sem02 from runtest/ipc.
Ack!
Quoted 3 lines
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Wei,
Quoted 10 lines
Quoted 8 lines
Quoted 5 lines
There is no point in having two different directories with
semop()testcaes so it would make sense to move these two tests into the syscalls/ipc/semop/ directory as semop04 and semop05. So we moveipc/semaphore/tests to syscalls/ipc/semop/. Also update runtest files accordingly.As I already stated, I'm not really sure this is good to do, but maybe I'm missing something. I wonder what others thing about it.
Ah, you also start work on this?
No, I just shared my doubt about this move.
Quoted 2 lines
Should i still continue work on this patch or not?
To me this is not bad thing at least, we do some clean work and reorganize the test cases.
Probably yes, but I'd prefer somebody else from LTP maintainers has also acked this.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Li Wang
Reviewed-byPetr Vorel <[email protected]> wrote:
Hi Wei,
Quoted 9 lines
Quoted 6 lines
There is no point in having two different directories with
semop()testcaes so it would make sense to move these two tests into the syscalls/ipc/semop/ directory as semop04 and semop05. So we moveipc/semaphore/tests to syscalls/ipc/semop/. Also update runtest files accordingly.
Quoted 3 lines
As I already stated, I'm not really sure this is good to do, but maybe I'm missing something. I wonder what others think about it.
This patch makes sense. Petr, I know what you're concerned about, but it is correct to move them into syscalls/ipc/semop/.
They essentially all belong to System V IPC way to use semaphore which includes <sys/sem.h>:
semid_ds
semget()
semctl()
semop()
To distinguish from another POSIX IPC way which
include <semaphore.h>:
sem_open()
sem_close()
sem_unlink()
sem_post(), sem_wait()
sem_getvalue()
sem_init()
sem_destrory()
The sem02.c needs '-lpthread' only because it invoked pthread_attr_init/exit functions in the test, but not any POSIX IPC functions.
So you have my reviewed-by in patch v4:
Signature · 5 lines
Regards, Li Wang -- Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 36 lines
Petr Vorel <[email protected]> wrote:
Hi Wei,
Quoted 10 lines
Quoted 5 lines
There is no point in having two different directories with
semop()testcaes so it would make sense to move these two tests into the syscalls/ipc/semop/ directory as semop04 and semop05. So we moveipc/semaphore/tests to syscalls/ipc/semop/. Also update runtest files accordingly.As I already stated, I'm not really sure this is good to do, but maybe I'm missing something. I wonder what others think about it.
This patch makes sense. Petr, I know what you're concerned about, but it is correct to move them into syscalls/ipc/semop/.
They essentially all belong to System V IPC way to use semaphore which includes <
sys/sem.h>:
semid_ds
semget()
semctl()
semop()To distinguish from another POSIX IPC way which
include <semaphore.h>:
sem_open()
sem_close()
sem_unlink()
sem_post(),sem_wait()
sem_getvalue()
sem_init()
sem_destrory()
Quoted 5 lines
The
sem02.cneeds '-lpthread' only because it invoked pthread_attr_init/exit functions in the test, but not any POSIX IPC functions.So you have my reviewed-by in patch v4:
Reviewed-by Li Wang <[email protected]>
Li, thanks for having look, first patch in merged v4.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 2/2 semop04:Refactor with new API
In reply to Wei Gao via ltp--- testcases/kernel/syscalls/ipc/semop/semop04.c | 163 ++++++++---------- 1 file changed, 68 insertions(+), 95 deletions(-)
testcases/kernel/syscalls/ipc/semop/semop04.c +68 -95
@@ -1,36 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0 /* -* -* Copyright (c) International Business Machines Corp., 2001 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +* Copyright (c) International Business Machines Corp., 2001 +* Copyright (C) 2023 Linux Test Project, Inc. */ -/* -* FILE : sem01.c -* DESCRIPTION : Creates a semaphore and two processes. The processes -* each go through a loop where they semdown, delay for a -* random amount of time, and semup, so they will almost -* always be fighting for control of the semaphore. -* HISTORY: -* 01/15/2001 Paul Larson ([email protected]) -* -written -* 11/09/2001 Manoj Iyer ([email protected]) -* Modified. -* - Removed compiler warnings. -* added exit to the end of function main() +/*\ +* [Description] * +* Creates a semaphore and two processes. The processes +* each go through a loop where they semdown, delay for a +* random amount of time, and semup, so they will almost +* always be fighting for control of the semaphore. */ #include <unistd.h>
@@ -41,103 +21,85 @@#include <sys/wait.h> #include <sys/ipc.h> #include "lapi/sem.h" +#include "tst_test.h" +#include "tst_safe_sysv_ipc.h" -int verbose =0 ; -int loops =100 ; -int errors =0 ; +static char *verbose; +static int loops =100 ; +static char *opt_loops_str; -int semup (int semid) +static void semup (int semid) {struct sembuf semops; + semops.sem_num =0 ; + semops.sem_op =1 ; + semops.sem_flg =SEM_UNDO ; -if (semop (semid, &semops,1 ) ==-1 ) { -perror ("semup" ); - errors++; -return 1 ; - } -return 0 ; + +SAFE_SEMOP (semid, &semops,1 ); } -int semdown (int semid) +static void semdown (int semid) {struct sembuf semops; + semops.sem_num =0 ; + semops.sem_op =-1 ; + semops.sem_flg =SEM_UNDO ; -if (semop (semid, &semops,1 ) ==-1 ) { -perror ("semdown" ); - errors++; -return 1 ; - } -return 0 ; + +SAFE_SEMOP (semid, &semops,1 ); } -void delayloop () +static void delayloop (void ) {int delay; + delay =1 + ((100.0 *rand ()) /RAND_MAX ); +if (verbose) -printf ("in delay function for %d microseconds\n" , delay); +tst_res (TINFO ,"in delay function for %d microseconds" , delay);usleep (delay); }void mainloop (int semid) {int i; +for (i =0 ; i < loops; i++) { -if (semdown (semid)) { -printf ("semdown failed\n" ); - } +semdown (semid);if (verbose) -printf ("sem is down\n" ); +tst_res (TINFO ,"Sem is down" );delayloop (); -if (semup (semid)) { -printf ("semup failed\n" ); - } +semup (semid);if (verbose) -printf ("sem is up\n" ); +tst_res (TINFO ,"Sem is up" ); } } -int main (int argc,char *argv[]) +static void run (void ) { -int semid, opt; +int semid;union semun semunion; -extern char *optarg;pid_t pid;int chstat; -while ((opt =getopt (argc, argv,"l:vh" )) !=EOF ) { -switch ((char )opt) { -case 'l' : - loops =atoi (optarg); -break ; -case 'v' : - verbose =1 ; -break ; -case 'h' : -default : -printf ("Usage: -l loops [-v]\n" ); -exit (1 ); - } - } -/* set up the semaphore */ -if ((semid =semget ((key_t )9142 ,1 ,0666 |IPC_CREAT )) <0 ) { -printf ("error in semget()\n" ); -exit (-1 ); - } + semid =SAFE_SEMGET ((key_t )9142 ,1 ,0666 |IPC_CREAT ); +if (semid <0 ) +tst_brk (TBROK ,"Error in semget id=%i" , semid); + semunion.val =1 ; -if (semctl (semid,0 ,SETVAL , semunion) ==-1 ) { -printf ("error in semctl\n" ); - } -if ((pid =fork ()) <0 ) { -printf ("fork error\n" ); -exit (-1 ); - } +SAFE_SEMCTL (semid,0 ,SETVAL , semunion); + + pid =SAFE_FORK (); +if (pid <0 ) +tst_brk (TBROK ,"Fork failed pid %i" , pid); +if (pid) {/* parent */ srand (pid);
@@ -147,18 +109,29 @@ int main(int argc, char *argv[])printf ("child exited with status\n" );exit (-1 ); } -if (semctl (semid,0 ,IPC_RMID , semunion) ==-1 ) { -printf ("error in semctl\n" ); - } -if (errors) { -printf ("FAIL: there were %d errors\n" , errors); - }else { -printf ("PASS: error count is 0\n" ); - } -exit (errors); +SAFE_SEMCTL (semid,0 ,IPC_RMID , semunion); +tst_res (TPASS ,"Semaphore up/down check success" ); }else {/* child */ mainloop (semid); } -exit (0 ); } + +static void setup (void ) +{ +if (opt_loops_str) + loops =SAFE_STRTOL (opt_loops_str,1 ,INT_MAX ); +} + +static struct tst_test test = { + .test_all = run, + .setup = setup, + .forks_child =1 , + .options = (struct tst_option []) { + {"l:" , &opt_loops_str,"Internal loops for semup/down" }, + {"v" , &verbose, +"Print information about successful semop." }, + {} + }, + .needs_root =1 , +};
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v3 2/2] semop04:Refactor with new API
Hi Wei,
...
testcases/kernel/syscalls/ipc/semop/semop04.c line 27
Quoted 4 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +1
-3-int verbose =0 ; -int loops =100 ; -int errors =0 ; +static char *verbose;
We usually prefer to not introduce verbose option in refactored tests. It'd be nice to have output, which is not too verbose, but not just TPASS message (something in between).
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v3 2/2] semop04:Refactor with new API
Quoted 11 lines · Petr Vorel
Hi Wei,
...
testcases/kernel/syscalls/ipc/semop/semop04.c line 27
Quoted 4 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +1
-3-int verbose =0 ; -int loops =100 ; -int errors =0 ; +static char *verbose;We usually prefer to not introduce verbose option in refactored tests. It'd be nice to have output, which is not too verbose, but not just TPASS message (something in between).
I just need double confirm with your idea:
Remove this option and let current verbose info print out by default?
Quoted 3 lines
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v3 2/2] semop04:Refactor with new API
In reply to Wei Gao via ltpHi Wei,
Quoted 1 line
+// SPDX-License-Identifier: GPL-2.0
Below is "or (at your option) any later version."
=>
// SPDX-License-Identifier: GPL-2.0-or-later
Quoted 17 lines
/*
- *
- * Copyright (c) International Business Machines Corp., 2001
- *- * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Quoted 2 lines
+ * Copyright (c) International Business Machines Corp., 2001
+ * Copyright (C) 2023 Linux Test Project, Inc.
Actually LTP started to work on the file since 2003, i.e.
* Copyright (C) 2003-2023 Linux Test Project, Inc.
Quoted 5 lines
*/
-/*
- * FILE :sem01.c
- * DESCRIPTION : Creates a semaphore and two processes. The processes
Quoted 7 lines
- * each go through a loop where they semdown, delay for a - * random amount of time, and semup, so they will almost - * always be fighting for control of the semaphore.- * HISTORY:
- * 01/15/2001 Paul Larson ([email protected])
- * -written
- * 11/09/2001 Manoj Iyer ([email protected])
Probably you should keep these two names (although you can clean formatting a bit), e.g.:
* Author: 2001 Paul Larson <[email protected]>
* Modified: 2001 Manoj Iyer <[email protected]>
Quoted 3 lines
- * Modified.
- * - Removed compiler warnings.
- * added exit to the end of functionmain()
...
testcases/kernel/syscalls/ipc/semop/semop04.c line 36
Quoted 7 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +3
-1-int semup (int semid) +static void semup (int semid) {struct sembuf semops; + semops.sem_num =0 ; +
nit: I'd remove this blank line (readability)
Quoted 10 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +2
-6semops.sem_op =1 ; + semops.sem_flg =SEM_UNDO ; -if (semop (semid, &semops,1 ) ==-1 ) { -perror ("semup" ); - errors++; -return 1 ; - } -return 0 ; +
testcases/kernel/syscalls/ipc/semop/semop04.c line 49
Quoted 10 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +4
-1+SAFE_SEMOP (semid, &semops,1 ); } -int semdown (int semid) +static void semdown (int semid) {struct sembuf semops; + semops.sem_num =0 ; +
nit: also here remove blank line.
Quoted 13 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +3
-6semops.sem_op =-1 ; + semops.sem_flg =SEM_UNDO ; -if (semop (semid, &semops,1 ) ==-1 ) { -perror ("semdown" ); - errors++; -return 1 ; - } -return 0 ; + +SAFE_SEMOP (semid, &semops,1 ); }
testcases/kernel/syscalls/ipc/semop/semop04.c line 64
Quoted 10 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +4
-2-void delayloop () +static void delayloop (void ) {int delay; + delay =1 + ((100.0 *rand ()) /RAND_MAX ); +if (verbose) -printf ("in delay function for %d microseconds\n" , delay); +tst_res (TINFO ,"in delay function for %d microseconds" , delay);
I'd remove this message.
Quoted 7 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +1
-0usleep (delay); }void mainloop (int semid) {int i; +
testcases/kernel/syscalls/ipc/semop/semop04.c
Quoted 10 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +2
-4for (i =0 ; i < loops; i++) { -if (semdown (semid)) { -printf ("semdown failed\n" ); - } +semdown (semid);if (verbose) -printf ("sem is down\n" ); +tst_res (TINFO ,"Sem is down" );
Actually this message is IMHO useless. semdown() uses SAFE_SEMOP() => we will see where it failed.
testcases/kernel/syscalls/ipc/semop/semop04.c line 79
Quoted 8 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +2
-4delayloop (); -if (semup (semid)) { -printf ("semup failed\n" ); - } +semup (semid);if (verbose) -printf ("sem is up\n" ); +tst_res (TINFO ,"Sem is up" );
The same applies there => I'd remove verbose and these messages.
Quoted 26 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +2
-16} } -int main (int argc,char *argv[]) +static void run (void ) { -int semid, opt; +int semid;union semun semunion; -extern char *optarg;pid_t pid;int chstat; -while ((opt =getopt (argc, argv,"l:vh" )) !=EOF ) { -switch ((char )opt) { -case 'l' : - loops =atoi (optarg); -break ; -case 'v' : - verbose =1 ; -break ; -case 'h' : -default : -printf ("Usage: -l loops [-v]\n" ); -exit (1 ); - }
testcases/kernel/syscalls/ipc/semop/semop04.c line 93
Quoted 10 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +3
-6- } -/* set up the semaphore */ -if ((semid =semget ((key_t )9142 ,1 ,0666 |IPC_CREAT )) <0 ) { -printf ("error in semget()\n" ); -exit (-1 ); - } + semid =SAFE_SEMGET ((key_t )9142 ,1 ,0666 |IPC_CREAT ); +if (semid <0 ) +tst_brk (TBROK ,"Error in semget id=%i" , semid);
All safe messages handles error checking and call tst_brk() on error => this if check is unreachable (useless) => remove it.
Quoted 5 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +1
-3+ semunion.val =1 ; -if (semctl (semid,0 ,SETVAL , semunion) ==-1 ) { -printf ("error in semctl\n" ); - }
testcases/kernel/syscalls/ipc/semop/semop04.c line 101
Quoted 10 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +5
-4-if ((pid =fork ()) <0 ) { -printf ("fork error\n" ); -exit (-1 ); - } +SAFE_SEMCTL (semid,0 ,SETVAL , semunion); + + pid =SAFE_FORK (); +if (pid <0 ) +tst_brk (TBROK ,"Fork failed pid %i" , pid);
Also this if check is useless => remove it.
testcases/kernel/syscalls/ipc/semop/semop04.c int main(int argc, char *argv[]) · line 111
Quoted 8 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +1
-0+if (pid) {/* parent */ srand (pid);@@ -147,18 +109,29 @@ int main(int argc, char *argv[])printf ("child exited with status\n" );exit (-1 ); }
NOTE: waitpid(), WIFEXITED(), printf() and exit(-1) here should be replaced by tst_reap_children(), see
https://github.com/linux-test-project/ltp/wiki/C-Test-API#18-doing-the-test-in-the-child-process91e6a95b7 ("clone08: convert to new LTP API")
Quoted 4 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +2
-0+SAFE_SEMCTL (semid,0 ,IPC_RMID , semunion); +tst_res (TPASS ,"Semaphore up/down check success" ); }else {/* child */
testcases/kernel/syscalls/ipc/semop/semop04.c int main(int argc, char *argv[]) · line 124
Quoted 10 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +6
-1mainloop (semid); } -exit (0 ); } + +static void setup (void ) +{ +if (opt_loops_str) + loops =SAFE_STRTOL (opt_loops_str,1 ,INT_MAX ); +}
I wonder if we need to specify loops, we have -i which can do more runs.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
v4 cover Refactor semaphore
In reply to Wei Gao via ltpWei Gao (2):
Move semaphore/ tests to semop/
semop04:Refactor with new API
runtest/ipc | 2 -
runtest/syscalls | 2 +
testcases/kernel/ipc/semaphore/.gitignore | 2 -
testcases/kernel/ipc/semaphore/Makefile | 30 ----
testcases/kernel/ipc/semaphore/sem01.c | 164 ------------------
.../kernel/syscalls/ipc/semop/.gitignore | 2 +
testcases/kernel/syscalls/ipc/semop/Makefile | 5 +-
testcases/kernel/syscalls/ipc/semop/semop04.c | 117 +++++++++++++
.../sem02.c => syscalls/ipc/semop/semop05.c} | 0
9 files changed, 125 insertions(+), 199 deletions(-)
delete mode 100644 testcases/kernel/ipc/semaphore/.gitignore
delete mode 100644 testcases/kernel/ipc/semaphore/Makefile
delete mode 100644 testcases/kernel/ipc/semaphore/sem01.c
create mode 100644 testcases/kernel/syscalls/ipc/semop/semop04.c
rename testcases/kernel/{ipc/semaphore/sem02.c => syscalls/ipc/semop/semop05.c} (100%)Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v4 1/2 Move semaphore/ tests to semop/
There is no point in having two different directories with semop() testcaes so it would make sense to move these two tests into the syscalls/ipc/semop/ directory as semop04 and semop05. So we move ipc/semaphore/ tests to syscalls/ipc/semop/. Also update runtest files accordingly.
---
runtest/ipc | 2 --
runtest/syscalls | 2 ++
testcases/kernel/ipc/semaphore/.gitignore | 2 --
testcases/kernel/ipc/semaphore/Makefile | 30 -------------------
.../kernel/syscalls/ipc/semop/.gitignore | 2 ++
testcases/kernel/syscalls/ipc/semop/Makefile | 5 +++-
.../sem01.c => syscalls/ipc/semop/semop04.c} | 0
.../sem02.c => syscalls/ipc/semop/semop05.c} | 0
8 files changed, 8 insertions(+), 35 deletions(-)
delete mode 100644 testcases/kernel/ipc/semaphore/.gitignore
delete mode 100644 testcases/kernel/ipc/semaphore/Makefile
rename testcases/kernel/{ipc/semaphore/sem01.c => syscalls/ipc/semop/semop04.c} (100%)
rename testcases/kernel/{ipc/semaphore/sem02.c => syscalls/ipc/semop/semop05.c} (100%)runtest/ipc +0 -2
@@ -28,5 +28,3 @@ pipeio_8 pipeio -T pipeio_8 -c 5 -s 5000 -i 10 -u -f x80 # spawns 5 children to write 10 chunks of 5000 bytes to an unnamed pipe # using non-blocking I/O -sem01 sem01 -sem02 sem02
runtest/syscalls +2 -0
@@ -1239,6 +1239,8 @@ semget06 semget06 semop01 semop01 semop02 semop02 semop03 semop03 +semop04 semop04 +semop05 semop05 send01 send01 send02 send02
testcases/kernel/ipc/semaphore/.gitignore deleted +0 -2
@@ -1,2 +0,0 @@ -/sem01 -/sem02
testcases/kernel/ipc/semaphore/Makefile deleted +0 -30
@@ -1,30 +0,0 @@ -# -# testcases/kernel/ipc/semaphore Makefile. -# -# Copyright (C) 2009, Cisco Systems Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Ngie Cooper, July 2009 -# - -top_srcdir ?= ../../../.. - -include $(top_srcdir)/include/mk/testcases.mk - -CPPFLAGS += -I../include -LDLIBS += -lpthread - -include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/semop/.gitignore +2 -0
@@ -1,3 +1,5 @@ /semop01 /semop02 /semop03 +/semop04 +/semop05
testcases/kernel/syscalls/ipc/semop/Makefile +4 -1
@@ -7,6 +7,9 @@ LTPLIBS = ltpnewipc include $(top_srcdir)/include/mk/testcases.mk -LTPLDLIBS = -lltpnewipc +semop01: LTPLDLIBS = -lltpnewipc +semop02: LTPLDLIBS = -lltpnewipc +semop03: LTPLDLIBS = -lltpnewipc +semop05: LDLIBS += -lpthread include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/semop/semop04.c renamed from testcases/kernel/ipc/semaphore/sem01.c +0 -0
testcases/kernel/syscalls/ipc/semop/semop05.c renamed from testcases/kernel/ipc/semaphore/sem02.c +0 -0
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v4 2/2 semop04:Refactor with new API
In reply to Wei Gao via ltp--- testcases/kernel/syscalls/ipc/semop/semop04.c | 159 ++++++------------ 1 file changed, 56 insertions(+), 103 deletions(-)
testcases/kernel/syscalls/ipc/semop/semop04.c +56 -103
@@ -1,36 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* +* Copyright (c) International Business Machines Corp., 2001 +* Copyright (C) 2003-2023 Linux Test Project, Inc. +* Author: 2001 Paul Larson <[email protected]> +* Modified: 2001 Manoj Iyer <[email protected]> * -* Copyright (c) International Business Machines Corp., 2001 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* -* FILE : sem01.c -* DESCRIPTION : Creates a semaphore and two processes. The processes -* each go through a loop where they semdown, delay for a -* random amount of time, and semup, so they will almost -* always be fighting for control of the semaphore. -* HISTORY: -* 01/15/2001 Paul Larson ([email protected]) -* -written -* 11/09/2001 Manoj Iyer ([email protected]) -* Modified. -* - Removed compiler warnings. -* added exit to the end of function main() +/*\ +* [Description] * +* Creates a semaphore and two processes. The processes +* each go through a loop where they semdown, delay for a +* random amount of time, and semup, so they will almost +* always be fighting for control of the semaphore. */ #include <unistd.h>
@@ -41,124 +24,94 @@#include <sys/wait.h> #include <sys/ipc.h> #include "lapi/sem.h" +#include "tst_test.h" +#include "tst_safe_sysv_ipc.h" -int verbose =0 ; -int loops =100 ; -int errors =0 ; +static int loops =100 ; +static char *opt_loops_str; -int semup (int semid) +static void semup (int semid) {struct sembuf semops; + semops.sem_num =0 ; semops.sem_op =1 ; semops.sem_flg =SEM_UNDO ; -if (semop (semid, &semops,1 ) ==-1 ) { -perror ("semup" ); - errors++; -return 1 ; - } -return 0 ; + +SAFE_SEMOP (semid, &semops,1 ); } -int semdown (int semid) +static void semdown (int semid) {struct sembuf semops; + semops.sem_num =0 ; semops.sem_op =-1 ; semops.sem_flg =SEM_UNDO ; -if (semop (semid, &semops,1 ) ==-1 ) { -perror ("semdown" ); - errors++; -return 1 ; - } -return 0 ; + +SAFE_SEMOP (semid, &semops,1 ); } -void delayloop () +static void delayloop (void ) {int delay; + delay =1 + ((100.0 *rand ()) /RAND_MAX ); -if (verbose) -printf ("in delay function for %d microseconds\n" , delay);usleep (delay); }void mainloop (int semid) {int i; +for (i =0 ; i < loops; i++) { -if (semdown (semid)) { -printf ("semdown failed\n" ); - } -if (verbose) -printf ("sem is down\n" ); +semdown (semid);delayloop (); -if (semup (semid)) { -printf ("semup failed\n" ); - } -if (verbose) -printf ("sem is up\n" ); +semup (semid); } } -int main (int argc,char *argv[]) +static void run (void ) { -int semid, opt; +int semid;union semun semunion; -extern char *optarg;pid_t pid; -int chstat; - -while ((opt =getopt (argc, argv,"l:vh" )) !=EOF ) { -switch ((char )opt) { -case 'l' : - loops =atoi (optarg); -break ; -case 'v' : - verbose =1 ; -break ; -case 'h' : -default : -printf ("Usage: -l loops [-v]\n" ); -exit (1 ); - } - }/* set up the semaphore */ -if ((semid =semget ((key_t )9142 ,1 ,0666 |IPC_CREAT )) <0 ) { -printf ("error in semget()\n" ); -exit (-1 ); - } + semid =SAFE_SEMGET ((key_t )9142 ,1 ,0666 |IPC_CREAT ); + semunion.val =1 ; -if (semctl (semid,0 ,SETVAL , semunion) ==-1 ) { -printf ("error in semctl\n" ); - } -if ((pid =fork ()) <0 ) { -printf ("fork error\n" ); -exit (-1 ); - } +SAFE_SEMCTL (semid,0 ,SETVAL , semunion); + + pid =SAFE_FORK (); +if (pid) {/* parent */ srand (pid);mainloop (semid); -waitpid (pid, &chstat,0 ); -if (!WIFEXITED (chstat)) { -printf ("child exited with status\n" ); -exit (-1 ); - } -if (semctl (semid,0 ,IPC_RMID , semunion) ==-1 ) { -printf ("error in semctl\n" ); - } -if (errors) { -printf ("FAIL: there were %d errors\n" , errors); - }else { -printf ("PASS: error count is 0\n" ); - } -exit (errors); +tst_reap_children (); +SAFE_SEMCTL (semid,0 ,IPC_RMID , semunion); +tst_res (TPASS ,"Semaphore up/down check success" ); }else {/* child */ mainloop (semid); } -exit (0 ); } + +static void setup (void ) +{ +if (opt_loops_str) + loops =SAFE_STRTOL (opt_loops_str,1 ,INT_MAX ); +} + +static struct tst_test test = { + .test_all = run, + .setup = setup, + .forks_child =1 , + .options = (struct tst_option []) { + {"l:" , &opt_loops_str,"Internal loops for semup/down" }, + {} + }, + .needs_root =1 , +};
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v4 2/2] semop04:Refactor with new API
Hi Wei
nit: in subject we use space after colon (readability):
"semop04:Refactor with new API" => "semop04: Refactor with new API"
Quoted 10 lines
Signed-off-by Wei Gao <[email protected]>--- testcases/kernel/syscalls/ipc/semop/semop04.c | 159 ++++++------------ 1 file changed, 56 insertions(+), 103 deletions(-)testcases/kernel/syscalls/ipc/semop/semop04.c +0
-0
testcases/kernel/syscalls/ipc/semop/semop04.c line 7
Quoted 7 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +5
-0@@ -1,36 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* +* Copyright (c) International Business Machines Corp., 2001 +* Copyright (C) 2003-2023 Linux Test Project, Inc. +* Author: 2001 Paul Larson <[email protected]> +* Modified: 2001 Manoj Iyer <[email protected]> *
nit: Please remove this line with just star ('*'), when it follows */
Quoted 41 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +6
-28-* Copyright (c) International Business Machines Corp., 2001 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* -* FILE : sem01.c -* DESCRIPTION : Creates a semaphore and two processes. The processes -* each go through a loop where they semdown, delay for a -* random amount of time, and semup, so they will almost -* always be fighting for control of the semaphore. -* HISTORY: -* 01/15/2001 Paul Larson ([email protected]) -* -written -* 11/09/2001 Manoj Iyer ([email protected]) -* Modified. -* - Removed compiler warnings. -* added exit to the end of function main() +/*\ +* [Description] * +* Creates a semaphore and two processes. The processes +* each go through a loop where they semdown, delay for a +* random amount of time, and semup, so they will almost +* always be fighting for control of the semaphore. */ #include <unistd.h>
testcases/kernel/syscalls/ipc/semop/semop04.c line 24
Quoted 1 line
testcases/kernel/syscalls/ipc/semop/semop04.c +0
-0@@ -41,124 +24,94 @@#include <sys/wait.h>
nit: I'd remove this (we no longer use waitpid()). Also I'd remove <errno.h> (IMHO no errno is used).
testcases/kernel/syscalls/ipc/semop/semop04.c line 31
Quoted 10 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +4
-3#include <sys/ipc.h> #include "lapi/sem.h" +#include "tst_test.h" +#include "tst_safe_sysv_ipc.h" -int verbose =0 ; -int loops =100 ; -int errors =0 ; +static int loops =100 ; +static char *opt_loops_str;
I'm not sure if this worth to have opt for loops. I'd just define it:
#define LOOPS 1000
and not allow to overwrite (even with 1000 it's fast).
Quoted 38 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +9
-15-int semup (int semid) +static void semup (int semid) {struct sembuf semops; + semops.sem_num =0 ; semops.sem_op =1 ; semops.sem_flg =SEM_UNDO ; -if (semop (semid, &semops,1 ) ==-1 ) { -perror ("semup" ); - errors++; -return 1 ; - } -return 0 ; + +SAFE_SEMOP (semid, &semops,1 ); } -int semdown (int semid) +static void semdown (int semid) {struct sembuf semops; + semops.sem_num =0 ; semops.sem_op =-1 ; semops.sem_flg =SEM_UNDO ; -if (semop (semid, &semops,1 ) ==-1 ) { -perror ("semdown" ); - errors++; -return 1 ; - } -return 0 ; + +SAFE_SEMOP (semid, &semops,1 ); } -void delayloop () +static void delayloop (void )
testcases/kernel/syscalls/ipc/semop/semop04.c line 63
Quoted 10 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +1
-2{int delay; + delay =1 + ((100.0 *rand ()) /RAND_MAX ); -if (verbose) -printf ("in delay function for %d microseconds\n" , delay);usleep (delay); }void mainloop (int semid)
This should also be static.
Quoted 2 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +0
-0{int i;
...
testcases/kernel/syscalls/ipc/semop/semop04.c line 90
Quoted 6 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +4
-0+SAFE_SEMCTL (semid,0 ,SETVAL , semunion); + + pid =SAFE_FORK (); +if (pid) {/* parent */
Please remove this obvious comment.
Quoted 2 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +0
-0srand (pid);mainloop (semid);
...
testcases/kernel/syscalls/ipc/semop/semop04.c line 97
Quoted 5 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +3
-0+tst_reap_children (); +SAFE_SEMCTL (semid,0 ,IPC_RMID , semunion); +tst_res (TPASS ,"Semaphore up/down check success" ); }else {/* child */
And this one.
testcases/kernel/syscalls/ipc/semop/semop04.c line 106
Quoted 10 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +6
-1mainloop (semid); } -exit (0 ); } + +static void setup (void ) +{ +if (opt_loops_str) + loops =SAFE_STRTOL (opt_loops_str,1 ,INT_MAX ); +}
This is to be removed.
testcases/kernel/syscalls/ipc/semop/semop04.c line 114
Quoted 8 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +8
-0+ +static struct tst_test test = { + .test_all = run, + .setup = setup, + .forks_child =1 , + .options = (struct tst_option []) { + {"l:" , &opt_loops_str,"Internal loops for semup/down" }, + {}
This is going to be removed.
testcases/kernel/syscalls/ipc/semop/semop04.c line 116
Quoted 2 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +2
-0+ }, + .needs_root = 1,
Do we really need root? I guess no.
Kind regards,
Petr
Quoted 1 line
+};
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v5 2/2 semop04: Refactor with new API
In reply to Wei Gao via ltp--- testcases/kernel/syscalls/ipc/semop/semop04.c | 155 +++++------------- 1 file changed, 45 insertions(+), 110 deletions(-)
testcases/kernel/syscalls/ipc/semop/semop04.c +45 -110
@@ -1,164 +1,99 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* -* Copyright (c) International Business Machines Corp., 2001 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +* Copyright (c) International Business Machines Corp., 2001 +* Copyright (C) 2003-2023 Linux Test Project, Inc. +* Author: 2001 Paul Larson <[email protected]> +* Modified: 2001 Manoj Iyer <[email protected]> */ -/* -* FILE : sem01.c -* DESCRIPTION : Creates a semaphore and two processes. The processes -* each go through a loop where they semdown, delay for a -* random amount of time, and semup, so they will almost -* always be fighting for control of the semaphore. -* HISTORY: -* 01/15/2001 Paul Larson ([email protected]) -* -written -* 11/09/2001 Manoj Iyer ([email protected]) -* Modified. -* - Removed compiler warnings. -* added exit to the end of function main() +/*\ +* [Description] * +* Creates a semaphore and two processes. The processes +* each go through a loop where they semdown, delay for a +* random amount of time, and semup, so they will almost +* always be fighting for control of the semaphore. */ #include <unistd.h> #include <stdlib.h> #include <stdio.h> -#include <errno.h> #include <sys/types.h> -#include <sys/wait.h> #include <sys/ipc.h> #include "lapi/sem.h" +#include "tst_test.h" +#include "tst_safe_sysv_ipc.h" -int verbose =0 ; -int loops =100 ; -int errors =0 ; +#define LOOPS 1000 -int semup (int semid) +static void semup (int semid) {struct sembuf semops; + semops.sem_num =0 ; semops.sem_op =1 ; semops.sem_flg =SEM_UNDO ; -if (semop (semid, &semops,1 ) ==-1 ) { -perror ("semup" ); - errors++; -return 1 ; - } -return 0 ; + +SAFE_SEMOP (semid, &semops,1 ); } -int semdown (int semid) +static void semdown (int semid) {struct sembuf semops; + semops.sem_num =0 ; semops.sem_op =-1 ; semops.sem_flg =SEM_UNDO ; -if (semop (semid, &semops,1 ) ==-1 ) { -perror ("semdown" ); - errors++; -return 1 ; - } -return 0 ; + +SAFE_SEMOP (semid, &semops,1 ); } -void delayloop () +static void delayloop (void ) {int delay; + delay =1 + ((100.0 *rand ()) /RAND_MAX ); -if (verbose) -printf ("in delay function for %d microseconds\n" , delay);usleep (delay); } -void mainloop (int semid) +static void mainloop (int semid) {int i; -for (i =0 ; i < loops; i++) { -if (semdown (semid)) { -printf ("semdown failed\n" ); - } -if (verbose) -printf ("sem is down\n" ); + +for (i =0 ; i <LOOPS ; i++) { +semdown (semid);delayloop (); -if (semup (semid)) { -printf ("semup failed\n" ); - } -if (verbose) -printf ("sem is up\n" ); +semup (semid); } } -int main (int argc,char *argv[]) +static void run (void ) { -int semid, opt; +int semid;union semun semunion; -extern char *optarg;pid_t pid; -int chstat; - -while ((opt =getopt (argc, argv,"l:vh" )) !=EOF ) { -switch ((char )opt) { -case 'l' : - loops =atoi (optarg); -break ; -case 'v' : - verbose =1 ; -break ; -case 'h' : -default : -printf ("Usage: -l loops [-v]\n" ); -exit (1 ); - } - }/* set up the semaphore */ -if ((semid =semget ((key_t )9142 ,1 ,0666 |IPC_CREAT )) <0 ) { -printf ("error in semget()\n" ); -exit (-1 ); - } + semid =SAFE_SEMGET ((key_t )9142 ,1 ,0666 |IPC_CREAT ); + semunion.val =1 ; -if (semctl (semid,0 ,SETVAL , semunion) ==-1 ) { -printf ("error in semctl\n" ); - } -if ((pid =fork ()) <0 ) { -printf ("fork error\n" ); -exit (-1 ); - } +SAFE_SEMCTL (semid,0 ,SETVAL , semunion); + + pid =SAFE_FORK (); +if (pid) { -/* parent */ srand (pid);mainloop (semid); -waitpid (pid, &chstat,0 ); -if (!WIFEXITED (chstat)) { -printf ("child exited with status\n" ); -exit (-1 ); - } -if (semctl (semid,0 ,IPC_RMID , semunion) ==-1 ) { -printf ("error in semctl\n" ); - } -if (errors) { -printf ("FAIL: there were %d errors\n" , errors); - }else { -printf ("PASS: error count is 0\n" ); - } -exit (errors); +tst_reap_children (); +SAFE_SEMCTL (semid,0 ,IPC_RMID , semunion); +tst_res (TPASS ,"Semaphore up/down check success" ); }else { -/* child */ mainloop (semid); } -exit (0 ); } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [v5,2/2] semop04: Refactor with new API
Hi Wei,
Quoted 10 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +2
-3-void delayloop () +static void delayloop (void ) {int delay; + delay =1 + ((100.0 *rand ()) /RAND_MAX ); -if (verbose) -printf ("in delay function for %d microseconds\n" , delay);usleep (delay); }
...
testcases/kernel/syscalls/ipc/semop/semop04.c line 65
Quoted 3 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +2
-0+for (i =0 ; i <LOOPS ; i++) { +semdown (semid);delayloop ();
Why not just:
usleep(1 + ((100.0 * rand()) / RAND_MAX));
and delete whole delayloop() function?
Quoted 7 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +1
-5-if (semup (semid)) { -printf ("semup failed\n" ); - } -if (verbose) -printf ("sem is up\n" ); +semup (semid); }
...
Quoted 31 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +6
-19/* set up the semaphore */ -if ((semid =semget ((key_t )9142 ,1 ,0666 |IPC_CREAT )) <0 ) { -printf ("error in semget()\n" ); -exit (-1 ); - } + semid =SAFE_SEMGET ((key_t )9142 ,1 ,0666 |IPC_CREAT ); + semunion.val =1 ; -if (semctl (semid,0 ,SETVAL , semunion) ==-1 ) { -printf ("error in semctl\n" ); - } -if ((pid =fork ()) <0 ) { -printf ("fork error\n" ); -exit (-1 ); - } +SAFE_SEMCTL (semid,0 ,SETVAL , semunion); + + pid =SAFE_FORK (); +if (pid) { -/* parent */ srand (pid);mainloop (semid); -waitpid (pid, &chstat,0 ); -if (!WIFEXITED (chstat)) { -printf ("child exited with status\n" ); -exit (-1 ); - } -if (semctl (semid,0 ,IPC_RMID , semunion) ==-1 ) { -printf ("error in semctl\n" );
testcases/kernel/syscalls/ipc/semop/semop04.c line 90
Quoted 10 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +3
-7- } -if (errors) { -printf ("FAIL: there were %d errors\n" , errors); - }else { -printf ("PASS: error count is 0\n" ); - } -exit (errors); +tst_reap_children (); +SAFE_SEMCTL (semid,0 ,IPC_RMID , semunion); +tst_res (TPASS ,"Semaphore up/down check success" );
Maybe here use plain semctl() verified with TST_EXP_POSITIVE() from tst_test_macros.h? This way we'd get TFAIL on failure instead of TPASS.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [v5,2/2] semop04: Refactor with new API
Hello,
Quoted 77 lines · Petr Vorel
Hi Wei,
Quoted 10 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +2
-3-void delayloop () +static void delayloop (void ) {int delay; + delay =1 + ((100.0 *rand ()) /RAND_MAX ); -if (verbose) -printf ("in delay function for %d microseconds\n" , delay);usleep (delay); }...
testcases/kernel/syscalls/ipc/semop/semop04.c line 65
Quoted 3 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +2
-0+for (i =0 ; i <LOOPS ; i++) { +semdown (semid);delayloop ();Why not just:
usleep(1 + ((100.0 * rand()) / RAND_MAX));and delete whole
delayloop()function?Quoted 7 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +1
-5-if (semup (semid)) { -printf ("semup failed\n" ); - } -if (verbose) -printf ("sem is up\n" ); +semup (semid); }...
Quoted 31 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +6
-19/* set up the semaphore */ -if ((semid =semget ((key_t )9142 ,1 ,0666 |IPC_CREAT )) <0 ) { -printf ("error in semget()\n" ); -exit (-1 ); - } + semid =SAFE_SEMGET ((key_t )9142 ,1 ,0666 |IPC_CREAT ); + semunion.val =1 ; -if (semctl (semid,0 ,SETVAL , semunion) ==-1 ) { -printf ("error in semctl\n" ); - } -if ((pid =fork ()) <0 ) { -printf ("fork error\n" ); -exit (-1 ); - } +SAFE_SEMCTL (semid,0 ,SETVAL , semunion); + + pid =SAFE_FORK (); +if (pid) { -/* parent */ srand (pid);mainloop (semid); -waitpid (pid, &chstat,0 ); -if (!WIFEXITED (chstat)) { -printf ("child exited with status\n" ); -exit (-1 ); - } -if (semctl (semid,0 ,IPC_RMID , semunion) ==-1 ) { -printf ("error in semctl\n" );testcases/kernel/syscalls/ipc/semop/semop04.c line 90
Quoted 10 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +3
-7- } -if (errors) { -printf ("FAIL: there were %d errors\n" , errors); - }else { -printf ("PASS: error count is 0\n" ); - } -exit (errors); +tst_reap_children (); +SAFE_SEMCTL (semid,0 ,IPC_RMID , semunion); +tst_res (TPASS ,"Semaphore up/down check success" );Maybe here use plain
semctl()verified withTST_EXP_POSITIVE()fromtst_test_macros.h? This way we'd get TFAIL on failure instead of TPASS.
Quoted 2 lines
Kind regards,
Petr
Setting to changes requested in patchwork.
Signature · 5 lines
Thank you, Richard. -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v6 2/2 semop04: Refactor with new API
In reply to Wei Gao via ltp--- testcases/kernel/syscalls/ipc/semop/semop04.c | 158 +++++------------- 1 file changed, 42 insertions(+), 116 deletions(-)
testcases/kernel/syscalls/ipc/semop/semop04.c +42 -116
@@ -1,164 +1,90 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* -* Copyright (c) International Business Machines Corp., 2001 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +* Copyright (c) International Business Machines Corp., 2001 +* Copyright (C) 2003-2023 Linux Test Project, Inc. +* Author: 2001 Paul Larson <[email protected]> +* Modified: 2001 Manoj Iyer <[email protected]> */ -/* -* FILE : sem01.c -* DESCRIPTION : Creates a semaphore and two processes. The processes -* each go through a loop where they semdown, delay for a -* random amount of time, and semup, so they will almost -* always be fighting for control of the semaphore. -* HISTORY: -* 01/15/2001 Paul Larson ([email protected]) -* -written -* 11/09/2001 Manoj Iyer ([email protected]) -* Modified. -* - Removed compiler warnings. -* added exit to the end of function main() +/*\ +* [Description] * +* Creates a semaphore and two processes. The processes +* each go through a loop where they semdown, delay for a +* random amount of time, and semup, so they will almost +* always be fighting for control of the semaphore. */ #include <unistd.h> #include <stdlib.h> #include <stdio.h> -#include <errno.h> #include <sys/types.h> -#include <sys/wait.h> #include <sys/ipc.h> #include "lapi/sem.h" +#include "tst_test.h" +#include "tst_safe_sysv_ipc.h" -int verbose =0 ; -int loops =100 ; -int errors =0 ; +#define LOOPS 1000 -int semup (int semid) +static void semup (int semid) {struct sembuf semops; + semops.sem_num =0 ; semops.sem_op =1 ; semops.sem_flg =SEM_UNDO ; -if (semop (semid, &semops,1 ) ==-1 ) { -perror ("semup" ); - errors++; -return 1 ; - } -return 0 ; + +SAFE_SEMOP (semid, &semops,1 ); } -int semdown (int semid) +static void semdown (int semid) {struct sembuf semops; + semops.sem_num =0 ; semops.sem_op =-1 ; semops.sem_flg =SEM_UNDO ; -if (semop (semid, &semops,1 ) ==-1 ) { -perror ("semdown" ); - errors++; -return 1 ; - } -return 0 ; -} -void delayloop () -{ -int delay; - delay =1 + ((100.0 *rand ()) /RAND_MAX ); -if (verbose) -printf ("in delay function for %d microseconds\n" , delay); -usleep (delay); +SAFE_SEMOP (semid, &semops,1 ); } -void mainloop (int semid) +static void mainloop (int semid) {int i; -for (i =0 ; i < loops; i++) { -if (semdown (semid)) { -printf ("semdown failed\n" ); - } -if (verbose) -printf ("sem is down\n" ); -delayloop (); -if (semup (semid)) { -printf ("semup failed\n" ); - } -if (verbose) -printf ("sem is up\n" ); + +for (i =0 ; i <LOOPS ; i++) { +semdown (semid); +usleep (1 + ((100.0 *rand ()) /RAND_MAX )); +semup (semid); } } -int main (int argc,char *argv[]) +static void run (void ) { -int semid, opt; +int semid;union semun semunion; -extern char *optarg;pid_t pid; -int chstat; - -while ((opt =getopt (argc, argv,"l:vh" )) !=EOF ) { -switch ((char )opt) { -case 'l' : - loops =atoi (optarg); -break ; -case 'v' : - verbose =1 ; -break ; -case 'h' : -default : -printf ("Usage: -l loops [-v]\n" ); -exit (1 ); - } - }/* set up the semaphore */ -if ((semid =semget ((key_t )9142 ,1 ,0666 |IPC_CREAT )) <0 ) { -printf ("error in semget()\n" ); -exit (-1 ); - } + semid =SAFE_SEMGET ((key_t )9142 ,1 ,0666 |IPC_CREAT ); + semunion.val =1 ; -if (semctl (semid,0 ,SETVAL , semunion) ==-1 ) { -printf ("error in semctl\n" ); - } -if ((pid =fork ()) <0 ) { -printf ("fork error\n" ); -exit (-1 ); - } +SAFE_SEMCTL (semid,0 ,SETVAL , semunion); + + pid =SAFE_FORK (); +if (pid) { -/* parent */ srand (pid);mainloop (semid); -waitpid (pid, &chstat,0 ); -if (!WIFEXITED (chstat)) { -printf ("child exited with status\n" ); -exit (-1 ); - } -if (semctl (semid,0 ,IPC_RMID , semunion) ==-1 ) { -printf ("error in semctl\n" ); - } -if (errors) { -printf ("FAIL: there were %d errors\n" , errors); - }else { -printf ("PASS: error count is 0\n" ); - } -exit (errors); +tst_reap_children (); +TST_EXP_POSITIVE (semctl (semid,0 ,IPC_RMID , semunion)); }else { -/* child */ mainloop (semid); } -exit (0 ); } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v7 2/2 semop04: Refactor with new API
--- testcases/kernel/syscalls/ipc/semop/semop04.c | 158 +++++------------- 1 file changed, 42 insertions(+), 116 deletions(-)
testcases/kernel/syscalls/ipc/semop/semop04.c +42 -116
@@ -1,164 +1,90 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* -* Copyright (c) International Business Machines Corp., 2001 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +* Copyright (c) International Business Machines Corp., 2001 +* Copyright (C) 2003-2023 Linux Test Project, Inc. +* Author: 2001 Paul Larson <[email protected]> +* Modified: 2001 Manoj Iyer <[email protected]> */ -/* -* FILE : sem01.c -* DESCRIPTION : Creates a semaphore and two processes. The processes -* each go through a loop where they semdown, delay for a -* random amount of time, and semup, so they will almost -* always be fighting for control of the semaphore. -* HISTORY: -* 01/15/2001 Paul Larson ([email protected]) -* -written -* 11/09/2001 Manoj Iyer ([email protected]) -* Modified. -* - Removed compiler warnings. -* added exit to the end of function main() +/*\ +* [Description] * +* Creates a semaphore and two processes. The processes +* each go through a loop where they semdown, delay for a +* random amount of time, and semup, so they will almost +* always be fighting for control of the semaphore. */ #include <unistd.h> #include <stdlib.h> #include <stdio.h> -#include <errno.h> #include <sys/types.h> -#include <sys/wait.h> #include <sys/ipc.h> #include "lapi/sem.h" +#include "tst_test.h" +#include "tst_safe_sysv_ipc.h" -int verbose =0 ; -int loops =100 ; -int errors =0 ; +#define LOOPS 1000 -int semup (int semid) +static void semup (int semid) {struct sembuf semops; + semops.sem_num =0 ; semops.sem_op =1 ; semops.sem_flg =SEM_UNDO ; -if (semop (semid, &semops,1 ) ==-1 ) { -perror ("semup" ); - errors++; -return 1 ; - } -return 0 ; + +SAFE_SEMOP (semid, &semops,1 ); } -int semdown (int semid) +static void semdown (int semid) {struct sembuf semops; + semops.sem_num =0 ; semops.sem_op =-1 ; semops.sem_flg =SEM_UNDO ; -if (semop (semid, &semops,1 ) ==-1 ) { -perror ("semdown" ); - errors++; -return 1 ; - } -return 0 ; -} -void delayloop () -{ -int delay; - delay =1 + ((100.0 *rand ()) /RAND_MAX ); -if (verbose) -printf ("in delay function for %d microseconds\n" , delay); -usleep (delay); +SAFE_SEMOP (semid, &semops,1 ); } -void mainloop (int semid) +static void mainloop (int semid) {int i; -for (i =0 ; i < loops; i++) { -if (semdown (semid)) { -printf ("semdown failed\n" ); - } -if (verbose) -printf ("sem is down\n" ); -delayloop (); -if (semup (semid)) { -printf ("semup failed\n" ); - } -if (verbose) -printf ("sem is up\n" ); + +for (i =0 ; i <LOOPS ; i++) { +semdown (semid); +usleep (1 + ((100.0 *rand ()) /RAND_MAX )); +semup (semid); } } -int main (int argc,char *argv[]) +static void run (void ) { -int semid, opt; +int semid;union semun semunion; -extern char *optarg;pid_t pid; -int chstat; - -while ((opt =getopt (argc, argv,"l:vh" )) !=EOF ) { -switch ((char )opt) { -case 'l' : - loops =atoi (optarg); -break ; -case 'v' : - verbose =1 ; -break ; -case 'h' : -default : -printf ("Usage: -l loops [-v]\n" ); -exit (1 ); - } - }/* set up the semaphore */ -if ((semid =semget ((key_t )9142 ,1 ,0666 |IPC_CREAT )) <0 ) { -printf ("error in semget()\n" ); -exit (-1 ); - } + semid =SAFE_SEMGET ((key_t )9142 ,1 ,0666 |IPC_CREAT ); + semunion.val =1 ; -if (semctl (semid,0 ,SETVAL , semunion) ==-1 ) { -printf ("error in semctl\n" ); - } -if ((pid =fork ()) <0 ) { -printf ("fork error\n" ); -exit (-1 ); - } +SAFE_SEMCTL (semid,0 ,SETVAL , semunion); + + pid =SAFE_FORK (); +if (pid) { -/* parent */ srand (pid);mainloop (semid); -waitpid (pid, &chstat,0 ); -if (!WIFEXITED (chstat)) { -printf ("child exited with status\n" ); -exit (-1 ); - } -if (semctl (semid,0 ,IPC_RMID , semunion) ==-1 ) { -printf ("error in semctl\n" ); - } -if (errors) { -printf ("FAIL: there were %d errors\n" , errors); - }else { -printf ("PASS: error count is 0\n" ); - } -exit (errors); +tst_reap_children (); +TST_EXP_POSITIVE (semctl (semid,0 ,IPC_RMID , semunion)); }else { -/* child */ mainloop (semid); } -exit (0 ); } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [v7,2/2] semop04: Refactor with new API
Hi!
Quoted 178 lines · Wei Gao via ltp
Signed-off-by Wei Gao <[email protected]>--- testcases/kernel/syscalls/ipc/semop/semop04.c | 158 +++++------------- 1 file changed, 42 insertions(+), 116 deletions(-)testcases/kernel/syscalls/ipc/semop/semop04.c +31
-96@@ -1,164 +1,90 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* -* Copyright (c) International Business Machines Corp., 2001 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +* Copyright (c) International Business Machines Corp., 2001 +* Copyright (C) 2003-2023 Linux Test Project, Inc. +* Author: 2001 Paul Larson <[email protected]> +* Modified: 2001 Manoj Iyer <[email protected]> */ -/* -* FILE : sem01.c -* DESCRIPTION : Creates a semaphore and two processes. The processes -* each go through a loop where they semdown, delay for a -* random amount of time, and semup, so they will almost -* always be fighting for control of the semaphore. -* HISTORY: -* 01/15/2001 Paul Larson ([email protected]) -* -written -* 11/09/2001 Manoj Iyer ([email protected]) -* Modified. -* - Removed compiler warnings. -* added exit to the end of function main() +/*\ +* [Description] * +* Creates a semaphore and two processes. The processes +* each go through a loop where they semdown, delay for a +* random amount of time, and semup, so they will almost +* always be fighting for control of the semaphore. */ #include <unistd.h> #include <stdlib.h> #include <stdio.h> -#include <errno.h> #include <sys/types.h> -#include <sys/wait.h> #include <sys/ipc.h> #include "lapi/sem.h" +#include "tst_test.h" +#include "tst_safe_sysv_ipc.h" -int verbose =0 ; -int loops =100 ; -int errors =0 ; +#define LOOPS 1000 -int semup (int semid) +static void semup (int semid) {struct sembuf semops; + semops.sem_num =0 ; semops.sem_op =1 ; semops.sem_flg =SEM_UNDO ; -if (semop (semid, &semops,1 ) ==-1 ) { -perror ("semup" ); - errors++; -return 1 ; - } -return 0 ; + +SAFE_SEMOP (semid, &semops,1 ); } -int semdown (int semid) +static void semdown (int semid) {struct sembuf semops; + semops.sem_num =0 ; semops.sem_op =-1 ; semops.sem_flg =SEM_UNDO ; -if (semop (semid, &semops,1 ) ==-1 ) { -perror ("semdown" ); - errors++; -return 1 ; - } -return 0 ; -} -void delayloop () -{ -int delay; - delay =1 + ((100.0 *rand ()) /RAND_MAX ); -if (verbose) -printf ("in delay function for %d microseconds\n" , delay); -usleep (delay); +SAFE_SEMOP (semid, &semops,1 ); } -void mainloop (int semid) +static void mainloop (int semid) {int i; -for (i =0 ; i < loops; i++) { -if (semdown (semid)) { -printf ("semdown failed\n" ); - } -if (verbose) -printf ("sem is down\n" ); -delayloop (); -if (semup (semid)) { -printf ("semup failed\n" ); - } -if (verbose) -printf ("sem is up\n" ); + +for (i =0 ; i <LOOPS ; i++) { +semdown (semid); +usleep (1 + ((100.0 *rand ()) /RAND_MAX )); +semup (semid); } } -int main (int argc,char *argv[]) +static void run (void ) { -int semid, opt; +int semid;union semun semunion; -extern char *optarg;pid_t pid; -int chstat; - -while ((opt =getopt (argc, argv,"l:vh" )) !=EOF ) { -switch ((char )opt) { -case 'l' : - loops =atoi (optarg); -break ; -case 'v' : - verbose =1 ; -break ; -case 'h' : -default : -printf ("Usage: -l loops [-v]\n" ); -exit (1 ); - } - }/* set up the semaphore */ -if ((semid =semget ((key_t )9142 ,1 ,0666 |IPC_CREAT )) <0 ) { -printf ("error in semget()\n" ); -exit (-1 ); - } + semid =SAFE_SEMGET ((key_t )9142 ,1 ,0666 |IPC_CREAT ); + semunion.val =1 ; -if (semctl (semid,0 ,SETVAL , semunion) ==-1 ) { -printf ("error in semctl\n" ); - } -if ((pid =fork ()) <0 ) {
testcases/kernel/syscalls/ipc/semop/semop04.c line 78
Quoted 10 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +4
-4-printf ("fork error\n" ); -exit (-1 ); - } +SAFE_SEMCTL (semid,0 ,SETVAL , semunion); + + pid =SAFE_FORK (); +if (pid) { -/* parent */ srand (pid);
I'm wondering if this is an error from the previous test as well. We are using mainloop() function that is using rand() inside both child and parent. So srand() should be called before parent and child, in order to have random seed initialized for both of them. I would also use srand(time(0)).
Quoted 18 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +2
-14mainloop (semid); -waitpid (pid, &chstat,0 ); -if (!WIFEXITED (chstat)) { -printf ("child exited with status\n" ); -exit (-1 ); - } -if (semctl (semid,0 ,IPC_RMID , semunion) ==-1 ) { -printf ("error in semctl\n" ); - } -if (errors) { -printf ("FAIL: there were %d errors\n" , errors); - }else { -printf ("PASS: error count is 0\n" ); - } -exit (errors); +tst_reap_children (); +TST_EXP_POSITIVE (semctl (semid,0 ,IPC_RMID , semunion)); }else {
testcases/kernel/syscalls/ipc/semop/semop04.c line 90
Quoted 10 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +5
-2-/* child */ mainloop (semid); } -exit (0 ); } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};
Thank you,
Andrea Cervesato
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [v7,2/2] semop04: Refactor with new API
Hello,
Quoted 178 lines · Andrea Cervesato via ltp
Hi!
Quoted 175 lines · Wei Gao via ltp
Signed-off-by Wei Gao <[email protected]>--- testcases/kernel/syscalls/ipc/semop/semop04.c | 158 +++++------------- 1 file changed, 42 insertions(+), 116 deletions(-)testcases/kernel/syscalls/ipc/semop/semop04.c +35
-91@@ -1,164 +1,90 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* -* Copyright (c) International Business Machines Corp., 2001 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +* Copyright (c) International Business Machines Corp., 2001 +* Copyright (C) 2003-2023 Linux Test Project, Inc. +* Author: 2001 Paul Larson <[email protected]> +* Modified: 2001 Manoj Iyer <[email protected]> */ -/* -* FILE : sem01.c -* DESCRIPTION : Creates a semaphore and two processes. The processes -* each go through a loop where they semdown, delay for a -* random amount of time, and semup, so they will almost -* always be fighting for control of the semaphore. -* HISTORY: -* 01/15/2001 Paul Larson ([email protected]) -* -written -* 11/09/2001 Manoj Iyer ([email protected]) -* Modified. -* - Removed compiler warnings. -* added exit to the end of function main() +/*\ +* [Description] * +* Creates a semaphore and two processes. The processes +* each go through a loop where they semdown, delay for a +* random amount of time, and semup, so they will almost +* always be fighting for control of the semaphore. */ #include <unistd.h> #include <stdlib.h> #include <stdio.h> -#include <errno.h> #include <sys/types.h> -#include <sys/wait.h> #include <sys/ipc.h> #include "lapi/sem.h" +#include "tst_test.h" +#include "tst_safe_sysv_ipc.h" -int verbose = 0; -int loops =100 ; -int errors =0 ; +#define LOOPS 1000 -int semup(int semid) +static void semup (int semid) {struct sembuf semops; + semops.sem_num =0 ; semops.sem_op =1 ; semops.sem_flg =SEM_UNDO ; -if (semop (semid, &semops,1 ) ==-1 ) { -perror ("semup" ); - errors++; -return 1 ; - } -return 0 ; + +SAFE_SEMOP (semid, &semops,1 ); } -int semdown(int semid) +static void semdown (int semid) {struct sembuf semops; + semops.sem_num =0 ; semops.sem_op =-1 ; semops.sem_flg =SEM_UNDO ; -if (semop (semid, &semops,1 ) ==-1 ) { -perror ("semdown" ); - errors++; -return 1 ; - } -return 0 ; -} -void delayloop() -{ -int delay; - delay =1 + ((100.0 *rand ()) /RAND_MAX ); -if (verbose) -printf ("in delay function for %d microseconds\n" , delay); -usleep (delay); +SAFE_SEMOP (semid, &semops,1 ); } -void mainloop(int semid) +static void mainloop (int semid) {int i; -for (i =0 ; i < loops; i++) { -if (semdown (semid)) { -printf ("semdown failed\n" ); - } -if (verbose) -printf ("sem is down\n" ); -delayloop (); -if (semup (semid)) { -printf ("semup failed\n" ); - } -if (verbose) -printf ("sem is up\n" ); + +for (i =0 ; i <LOOPS ; i++) { +semdown (semid); +usleep (1 + ((100.0 *rand ()) /RAND_MAX )); +semup (semid); } } -int main(int argc, char *argv[]) +static void run (void ) { -int semid, opt; +int semid;union semun semunion; -extern char *optarg;pid_t pid; -int chstat; - -while ((opt =getopt (argc, argv,"l:vh" )) !=EOF ) { -switch ((char )opt) { -case 'l' : - loops =atoi (optarg); -break ; -case 'v' : - verbose =1 ; -break ; -case 'h' : -default : -printf ("Usage: -l loops [-v]\n" ); -exit (1 ); - } - }/* set up the semaphore */ -if ((semid =semget ((key_t )9142 ,1 ,0666 |IPC_CREAT )) <0 ) { -printf ("error in semget()\n" ); -exit (-1 ); - } + semid =SAFE_SEMGET ((key_t )9142 ,1 ,0666 |IPC_CREAT ); + semunion.val =1 ; -if (semctl (semid,0 ,SETVAL , semunion) ==-1 ) { -printf ("error in semctl\n" ); - } - if ((pid = fork()) < 0) { -printf ("fork error\n" ); -exit (-1 ); - } +SAFE_SEMCTL (semid,0 ,SETVAL , semunion); + + pid =SAFE_FORK (); +
Quoted 8 lines
testcases/kernel/syscalls/ipc/semop/semop04.c line 78
Quoted 3 lines
testcases/kernel/syscalls/ipc/semop/semop04.c +0
-1if (pid) { -/* parent */ srand (pid);I'm wondering if this is an error from the previous test as well. We are using
mainloop()function that is usingrand()inside both child and parent. Sosrand()should be called before parent and child, in order to have random seed initialized for both of them. I would also use srand(time(0)).
Perhaps and also the value passed to srand should be printed for reproducing failures. (or just use the same value every time).
Setting to changes requested.
Signature · 5 lines
Thank you, Richard. -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v7 2/2 semop04: Refactor with new API
In reply to Wei Gao via ltp--- testcases/kernel/syscalls/ipc/semop/semop04.c | 163 +++++------------- 1 file changed, 46 insertions(+), 117 deletions(-)
testcases/kernel/syscalls/ipc/semop/semop04.c +46 -117
@@ -1,164 +1,93 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* -* Copyright (c) International Business Machines Corp., 2001 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +* Copyright (c) International Business Machines Corp., 2001 +* Copyright (C) 2003-2023 Linux Test Project, Inc. +* Author: 2001 Paul Larson <[email protected]> +* Modified: 2001 Manoj Iyer <[email protected]> */ -/* -* FILE : sem01.c -* DESCRIPTION : Creates a semaphore and two processes. The processes -* each go through a loop where they semdown, delay for a -* random amount of time, and semup, so they will almost -* always be fighting for control of the semaphore. -* HISTORY: -* 01/15/2001 Paul Larson ([email protected]) -* -written -* 11/09/2001 Manoj Iyer ([email protected]) -* Modified. -* - Removed compiler warnings. -* added exit to the end of function main() +/*\ +* [Description] * +* Creates a semaphore and two processes. The processes +* each go through a loop where they semdown, delay for a +* random amount of time, and semup, so they will almost +* always be fighting for control of the semaphore. */ #include <unistd.h> #include <stdlib.h> #include <stdio.h> -#include <errno.h> #include <sys/types.h> -#include <sys/wait.h> #include <sys/ipc.h> #include "lapi/sem.h" +#include "tst_test.h" +#include "tst_safe_sysv_ipc.h" -int verbose =0 ; -int loops =100 ; -int errors =0 ; +#define LOOPS 1000 +#define SEED 123 -int semup (int semid) +static void semup (int semid) {struct sembuf semops; + semops.sem_num =0 ; semops.sem_op =1 ; semops.sem_flg =SEM_UNDO ; -if (semop (semid, &semops,1 ) ==-1 ) { -perror ("semup" ); - errors++; -return 1 ; - } -return 0 ; + +SAFE_SEMOP (semid, &semops,1 ); } -int semdown (int semid) +static void semdown (int semid) {struct sembuf semops; + semops.sem_num =0 ; semops.sem_op =-1 ; semops.sem_flg =SEM_UNDO ; -if (semop (semid, &semops,1 ) ==-1 ) { -perror ("semdown" ); - errors++; -return 1 ; - } -return 0 ; -} -void delayloop () -{ -int delay; - delay =1 + ((100.0 *rand ()) /RAND_MAX ); -if (verbose) -printf ("in delay function for %d microseconds\n" , delay); -usleep (delay); +SAFE_SEMOP (semid, &semops,1 ); } -void mainloop (int semid) +static void mainloop (int semid) {int i; -for (i =0 ; i < loops; i++) { -if (semdown (semid)) { -printf ("semdown failed\n" ); - } -if (verbose) -printf ("sem is down\n" ); -delayloop (); -if (semup (semid)) { -printf ("semup failed\n" ); - } -if (verbose) -printf ("sem is up\n" ); + +for (i =0 ; i <LOOPS ; i++) { +semdown (semid); +usleep (1 + ((100.0 *rand ()) /RAND_MAX )); +semup (semid); } } -int main (int argc,char *argv[]) +static void run (void ) { -int semid, opt; +int semid;union semun semunion; -extern char *optarg;pid_t pid; -int chstat; - -while ((opt =getopt (argc, argv,"l:vh" )) !=EOF ) { -switch ((char )opt) { -case 'l' : - loops =atoi (optarg); -break ; -case 'v' : - verbose =1 ; -break ; -case 'h' : -default : -printf ("Usage: -l loops [-v]\n" ); -exit (1 ); - } - }/* set up the semaphore */ -if ((semid =semget ((key_t )9142 ,1 ,0666 |IPC_CREAT )) <0 ) { -printf ("error in semget()\n" ); -exit (-1 ); - } + semid =SAFE_SEMGET ((key_t )9142 ,1 ,0666 |IPC_CREAT ); + semunion.val =1 ; -if (semctl (semid,0 ,SETVAL , semunion) ==-1 ) { -printf ("error in semctl\n" ); - } -if ((pid =fork ()) <0 ) { -printf ("fork error\n" ); -exit (-1 ); - } +SAFE_SEMCTL (semid,0 ,SETVAL , semunion); + +tst_res (TINFO ,"srand seed is %d" ,SEED ); +srand (SEED ); + + pid =SAFE_FORK (); +if (pid) { -/* parent */ -srand (pid);mainloop (semid); -waitpid (pid, &chstat,0 ); -if (!WIFEXITED (chstat)) { -printf ("child exited with status\n" ); -exit (-1 ); - } -if (semctl (semid,0 ,IPC_RMID , semunion) ==-1 ) { -printf ("error in semctl\n" ); - } -if (errors) { -printf ("FAIL: there were %d errors\n" , errors); - }else { -printf ("PASS: error count is 0\n" ); - } -exit (errors); +tst_reap_children (); +TST_EXP_POSITIVE (semctl (semid,0 ,IPC_RMID , semunion)); }else { -/* child */ mainloop (semid); } -exit (0 ); } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp