From 9799b984482f7ce54d7f627561539116eb9931ca Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Sat, 26 May 2001 00:00:27 +0000 Subject: Add in message queue support, based on work from . This is required to compile util-linux --- include/sys/msg.h | 75 ++++++++++++++++++++++++++++++++++++++++++++++ include/sys/types.h | 2 ++ libc/misc/sysvipc/Makefile | 9 +++++- libc/misc/sysvipc/msgq.c | 52 ++++++++++++++++++++++++++++++++ 4 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 include/sys/msg.h create mode 100644 libc/misc/sysvipc/msgq.c diff --git a/include/sys/msg.h b/include/sys/msg.h new file mode 100644 index 000000000..cba58b364 --- /dev/null +++ b/include/sys/msg.h @@ -0,0 +1,75 @@ +/* Copyright (C) 1995, 1996, 1997, 1999, 2000 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 Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef _SYS_MSG_H +#define _SYS_MSG_H + +#include + +/* Get common definition of System V style IPC. */ +#include + +/* Get system dependent definition of `struct msqid_ds' and more. */ +#include + +/* Define types required by the standard. */ +#define __need_time_t +#include + +#ifndef __pid_t_defined +typedef __pid_t pid_t; +# define __pid_t_defined +#endif + +#ifndef __ssize_t_defined +typedef __ssize_t ssize_t; +# define __ssize_t_defined +#endif + +/* The following System V style IPC functions implement a message queue + system. The definition is found in XPG2. */ + +#ifdef __USE_GNU +/* Template for struct to be used as argument for `msgsnd' and `msgrcv'. */ +struct msgbuf + { + long int mtype; /* type of received/sent message */ + char mtext[1]; /* text of the message */ + }; +#endif + + +__BEGIN_DECLS + +/* Message queue control operation. */ +extern int msgctl (int __msqid, int __cmd, struct msqid_ds *__buf); + +/* Get messages queue. */ +extern int msgget (key_t __key, int __msgflg); + +/* Receive message from message queue. */ +extern int msgrcv (int __msqid, void *__msgp, size_t __msgsz, + long int __msgtyp, int __msgflg); + +/* Send message to message queue. */ +extern int msgsnd (int __msqid, __const void *__msgp, size_t __msgsz, + int __msgflg); + +__END_DECLS + +#endif /* sys/msg.h */ diff --git a/include/sys/types.h b/include/sys/types.h index 6154b7bd2..c746ad6c6 100644 --- a/include/sys/types.h +++ b/include/sys/types.h @@ -95,6 +95,7 @@ typedef __off64_t off64_t; #ifndef pid_t typedef __pid_t pid_t; # define pid_t pid_t +# define __pid_t_defined #endif #if defined __USE_SVID || defined __USE_XOPEN @@ -105,6 +106,7 @@ typedef __id_t id_t; #ifndef ssize_t typedef __ssize_t ssize_t; # define ssize_t ssize_t +# define __ssize_t_defined #endif #ifdef __USE_BSD diff --git a/libc/misc/sysvipc/Makefile b/libc/misc/sysvipc/Makefile index d94531788..8280137ca 100644 --- a/libc/misc/sysvipc/Makefile +++ b/libc/misc/sysvipc/Makefile @@ -31,10 +31,13 @@ MOBJ=semget.o semctl.o semop.o MSRC2=shm.c MOBJ2=shmat.o shmctl.o shmdt.o shmget.o +MSRC3=msgq.c +MOBJ3=msgctl.o msgget.o msgrcv.o msgsnd.o + CSRC = ftok.c COBJS=$(patsubst %.c,%.o, $(CSRC)) -OBJS=$(MOBJ) $(MOBJ2) $(COBJS) +OBJS=$(MOBJ) $(MOBJ2) $(MOBJ3) $(COBJS) all: $(OBJS) $(LIBC) @@ -52,6 +55,10 @@ $(MOBJ2): $(MSRC2) $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o $(STRIPTOOL) -x -R .note -R .comment $*.o +$(MOBJ3): $(MSRC3) + $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o + $(STRIPTOOL) -x -R .note -R .comment $*.o + $(COBJS): %.o : %.c $(CC) $(CFLAGS) -c $< -o $@ $(STRIPTOOL) -x -R .note -R .comment $*.o diff --git a/libc/misc/sysvipc/msgq.c b/libc/misc/sysvipc/msgq.c new file mode 100644 index 000000000..f373c1611 --- /dev/null +++ b/libc/misc/sysvipc/msgq.c @@ -0,0 +1,52 @@ +#include +#include +#include "ipc.h" + + +#ifdef L_msgctl +/* Message queue control operation. */ +int msgctl (int msqid, int cmd, struct msqid_ds *buf) +{ + return __ipc(IPCOP_msgctl ,msqid ,cmd ,0 ,buf); +} +#endif + + +#ifdef L_msgget +/* Get messages queue. */ +int msgget (key_t key, int msgflg) +{ + return __ipc(IPCOP_msgget ,key ,msgflg ,0 ,0); +} +#endif + + +struct new_msg_buf{ + struct msgbuf * oldmsg; + long int r_msgtyp; /* the fifth arg of __ipc */ +}; +/* Receive message from message queue. */ + + +#ifdef L_msgrcv +int msgrcv (int msqid, void *msgp, size_t msgsz, + long int msgtyp, int msgflg) +{ + struct new_msg_buf temp; + + temp.r_msgtyp = msgtyp; + temp.oldmsg = msgp; + return __ipc(IPCOP_msgrcv ,msqid ,msgsz ,msgflg ,&temp); +} +#endif + + + +#ifdef L_msgsnd +/* Send message to message queue. */ +int msgsnd (int msqid, const void *msgp, size_t msgsz, int msgflg) +{ + return __ipc(IPCOP_msgsnd, msqid, msgsz, msgflg, (void *)msgp); +} +#endif + -- cgit v1.2.3