[LTP] [PATCH v4 5/5] libs/libltpipc: Remove useless function and c file
Yang Xu
xuyang2018.jy@cn.fujitsu.com
Fri Mar 12 13:02:21 CET 2021
Only old msgstress* case use these apis, so we can remove them
Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
---
include/libmsgctl.h | 39 ----------
libs/libltpipc/libipc.c | 46 ------------
libs/libltpipc/libmsgctl.c | 147 -------------------------------------
3 files changed, 232 deletions(-)
delete mode 100644 include/libmsgctl.h
delete mode 100644 libs/libltpipc/libmsgctl.c
diff --git a/include/libmsgctl.h b/include/libmsgctl.h
deleted file mode 100644
index e1afeab5f..000000000
--- a/include/libmsgctl.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) International Business Machines Corp., 2002
- * Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved.
- *
- * 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 would 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 the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef __LIBMSGCTL_H__
-#define __LIBMSGCTL_H__
-
-#define FAIL 1
-#define PASS 0
-
-struct mbuffer {
- long type;
- struct {
- char len;
- char pbytes[99];
- } data;
-};
-
-int doreader(long key, int tid, long type, int child, int nreps);
-int dowriter(long key, int tid, long type, int child, int nreps);
-int fill_buffer(char *buf, char val, int size);
-int verify(char *buf, char val, int size, int child);
-
-#endif /*__LIBMSGCTL_H__ */
diff --git a/libs/libltpipc/libipc.c b/libs/libltpipc/libipc.c
index d94880f54..aeefaa9f4 100644
--- a/libs/libltpipc/libipc.c
+++ b/libs/libltpipc/libipc.c
@@ -172,49 +172,3 @@ void rm_shm(int shm_id)
}
#define BUFSIZE 512
-
-/*
- * Get the number of message queues already in use
- */
-int get_used_msgqueues(void)
-{
- FILE *f;
- int used_queues;
- char buff[BUFSIZE];
-
- f = popen("ipcs -q", "r");
- if (!f) {
- tst_brkm(TBROK | TERRNO, NULL, "pipe failed");
- }
- /* FIXME: Start at -4 because ipcs prints four lines of header */
- for (used_queues = -4; fgets(buff, BUFSIZE, f); used_queues++) ;
- pclose(f);
- if (used_queues < 0) {
- tst_brkm(TBROK, NULL, "Could not read output of 'ipcs' to "
- "calculate used message queues");
- }
- return used_queues;
-}
-
-/*
- * Get the max number of message queues allowed on system
- */
-int get_max_msgqueues(void)
-{
- FILE *f;
- char buff[BUFSIZE];
-
- /* Get the max number of message queues allowed on system */
- f = fopen("/proc/sys/kernel/msgmni", "r");
- if (!f) {
- tst_resm(TBROK, "Could not open /proc/sys/kernel/msgmni");
- return -1;
- }
- if (!fgets(buff, BUFSIZE, f)) {
- fclose(f);
- tst_resm(TBROK, "Could not read /proc/sys/kernel/msgmni");
- return -1;
- }
- fclose(f);
- return atoi(buff);
-}
diff --git a/libs/libltpipc/libmsgctl.c b/libs/libltpipc/libmsgctl.c
deleted file mode 100644
index ae459d480..000000000
--- a/libs/libltpipc/libmsgctl.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) International Business Machines Corp., 2002
- * Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved.
- *
- * 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 would 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 the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/msg.h>
-#include "libmsgctl.h"
-
-int doreader(long key, int tid, long type, int child, int nreps)
-{
- int i, size;
- int id;
- struct mbuffer buffer;
-
- id = msgget(key, 0);
- if (id < 0) {
- printf("msgget() error in the reader of child group %d: %s\n",
- child, strerror(errno));
-
- return FAIL;
- }
- if (id != tid) {
- printf("Message queue mismatch in the reader of child group %d for message queue id %d\n",
- child, id);
-
- return FAIL;
- }
- for (i = 0; i < nreps; i++) {
- memset(&buffer, 0, sizeof(buffer));
-
- size = msgrcv(id, &buffer, 100, type, 0);
- if (size < 0) {
- printf("msgrcv() error in child %d, read # = %d: %s\n",
- child, (i + 1), strerror(errno));
-
- return FAIL;
- }
- if (buffer.type != type) {
- printf("Type mismatch in child %d, read #d = %d: ",
- child, (i + 1));
- printf("for message got %ld, expected - %ld\n",
- buffer.type, type);
-
- return FAIL;
- }
- if (buffer.data.len + 1 != size) {
- printf("Size mismatch in child %d, read # = %d: ",
- child, (i + 1));
- printf("for message got %d, expected - %d\n",
- buffer.data.len + 1, size);
-
- return FAIL;
- }
- if (verify(buffer.data.pbytes, (key % 255), size - 1, child)) {
- printf("Verify failed in child %d read # = %d, key = %lx\n",
- child, (i + 1), key);
-
- return FAIL;
- }
- key++;
- }
- return PASS;
-}
-
-int dowriter(long key, int tid, long type, int child, int nreps)
-{
- int i, size;
- int id;
- struct mbuffer buffer;
-
- id = msgget(key, 0);
- if (id < 0) {
- printf("msgget() error in the writer of child group %d: %s\n",
- child, strerror(errno));
-
- return FAIL;
- }
- if (id != tid) {
- printf("Message queue mismatch in the reader of child group %d for message queue id %d\n",
- child, id);
-
- return FAIL;
- }
-
- for (i = 0; i < nreps; i++) {
- memset(&buffer, 0, sizeof(buffer));
-
- do {
- size = (lrand48() % 99);
- } while (size == 0);
- fill_buffer(buffer.data.pbytes, (key % 255), size);
- buffer.data.len = size;
- buffer.type = type;
- if (msgsnd(id, &buffer, size + 1, 0) < 0) {
- printf("msgsnd() error in child %d, write # = %d, key = %lx: %s\n",
- child, nreps, key, strerror(errno));
-
- return FAIL;
- }
- key++;
- }
- return PASS;
-}
-
-int fill_buffer(char *buf, char val, int size)
-{
- int i;
-
- for (i = 0; i < size; i++)
- buf[i] = val;
- return 0;
-}
-
-/* Check a buffer for correct values */
-int verify(char *buf, char val, int size, int child)
-{
- while (size-- > 0) {
- if (*buf++ != val) {
- printf("Verify error in child %d, *buf = %x, val = %x, size = %d\n",
- child, *buf, val, size);
-
- return FAIL;
- }
- }
- return PASS;
-}
--
2.23.0
More information about the ltp
mailing list