diff options
| -rw-r--r-- | libiohelp/get_conch.c | 8 | ||||
| -rw-r--r-- | libiohelp/handle_io_get_conch.c | 14 | ||||
| -rw-r--r-- | libiohelp/handle_io_release_conch.c | 8 | ||||
| -rw-r--r-- | libiohelp/initialize_conch.c | 6 | ||||
| -rw-r--r-- | libiohelp/iohelp.h | 20 | ||||
| -rw-r--r-- | libiohelp/verify_user_conch.c | 6 |
6 files changed, 31 insertions, 31 deletions
diff --git a/libiohelp/get_conch.c b/libiohelp/get_conch.c index 3d5fd8af..64d347ab 100644 --- a/libiohelp/get_conch.c +++ b/libiohelp/get_conch.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1993, 1994 Free Software Foundation + Copyright (C) 1993, 1994, 1996 Free Software Foundation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -15,12 +15,12 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "ioserver.h" +#include "iohelp.h" /* The conch must be locked when calling this routine. */ /* Remove any current holder of conch C. */ void -ioserver_get_conch (struct conch *c) +iohelp_get_conch (struct conch *c) { struct shared_io *user_sh; @@ -44,7 +44,7 @@ ioserver_get_conch (struct conch *c) case USER_COULD_HAVE_CONCH: user_sh->conch_status = USER_HAS_NOT_CONCH; spin_unlock (&user_sh->lock); - ioserver_fetch_shared_data (c->holder); + iohelp_fetch_shared_data (c->holder); break; case USER_HAS_NOT_CONCH: diff --git a/libiohelp/handle_io_get_conch.c b/libiohelp/handle_io_get_conch.c index 8c3a2948..452b3cfb 100644 --- a/libiohelp/handle_io_get_conch.c +++ b/libiohelp/handle_io_get_conch.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1993, 1994 Free Software Foundation + Copyright (C) 19931996 Free Software Foundation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -16,35 +16,35 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "ioserver.h" +#include "iohelp.h" /* Called by an I/O server when an io_get_conch message is received. The user represented by USER and USER_SH wants conch C; give it to her or return an error. */ void -ioserver_handle_io_get_conch (struct conch *c, void *user, +iohelp_handle_io_get_conch (struct conch *c, void *user, struct shared_io *user_sh) { if (c->holder == user) { if (user_sh->conch_status != USER_HAS_NOT_CONCH) - ioserver_fetch_shared_data (user); + iohelp_fetch_shared_data (user); else user_sh->accessed = user_sh->written = 0; - ioserver_put_shared_data (user); + iohelp_put_shared_data (user); user_sh->conch_status = USER_HAS_CONCH; } else { - ioserver_get_conch (c); + iohelp_get_conch (c); c->holder = user; c->holder_shared_page = user_sh; if (user_sh->conch_status == USER_HAS_NOT_CONCH) user_sh->accessed = user_sh->written = 0; user_sh->conch_status = USER_HAS_CONCH; - ioserver_put_shared_data (user); + iohelp_put_shared_data (user); } } diff --git a/libiohelp/handle_io_release_conch.c b/libiohelp/handle_io_release_conch.c index 27b79211..fa95a6e5 100644 --- a/libiohelp/handle_io_release_conch.c +++ b/libiohelp/handle_io_release_conch.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1993, 1994 Free Software Foundation + Copyright (C) 1993, 1994, 1996 Free Software Foundation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -15,19 +15,19 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "ioserver.h" +#include "iohelp.h" /* Called by an I/O server upon receipt of an io_release_conch message; The user identified by USER is done with conch C; release it and allow a waiting user to obtain the conch. */ void -ioserver_handle_io_release_conch (struct conch *c, void *user) +iohelp_handle_io_release_conch (struct conch *c, void *user) { if (c->holder_shared_page->conch_status != USER_HAS_NOT_CONCH) { c->holder_shared_page->conch_status = USER_HAS_NOT_CONCH; - ioserver_fetch_shared_data (c->holder); + iohelp_fetch_shared_data (c->holder); } if (c->holder == user) diff --git a/libiohelp/initialize_conch.c b/libiohelp/initialize_conch.c index 05d0bd0a..a5d5b76e 100644 --- a/libiohelp/initialize_conch.c +++ b/libiohelp/initialize_conch.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1993, 1994 Free Software Foundation + Copyright (C) 1993, 1994, 1996 Free Software Foundation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -15,12 +15,12 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "ioserver.h" +#include "iohelp.h" /* Called by an I/O server to initialize a conch structure C; M will be used to lock conch data structures. */ void -ioserver_initialize_conch (struct conch *c, struct mutex *m) +iohelp_initialize_conch (struct conch *c, struct mutex *m) { c->lock = m; condition_init (&c->wait); diff --git a/libiohelp/iohelp.h b/libiohelp/iohelp.h index b816a50e..2897653d 100644 --- a/libiohelp/iohelp.h +++ b/libiohelp/iohelp.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1993, 1994 Free Software Foundation + Copyright (C) 1993, 1994, 1996 Free Software Foundation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -15,8 +15,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _HURD_IOSERVER_ -#define _HURD_IOSERVER_ +#ifndef _HURD_IOHELP_ +#define _HURD_IOHELP_ #include <mach.h> #include <hurd/hurd_types.h> @@ -33,35 +33,35 @@ struct conch }; /* Initialize a conch box */ -void ioserver_initialize_conch (struct conch *, struct mutex *); +void iohelp_initialize_conch (struct conch *, struct mutex *); /* These routines are not reentrant. The server is responsible for ensuring that all calls to these routines are serialized by locking the lock passed to initialize_conch. */ /* Handle a user request to obtain the conch (io_get_conch) */ -void ioserver_handle_io_get_conch (struct conch *, void *, +void iohelp_handle_io_get_conch (struct conch *, void *, struct shared_io *); /* Obtain the conch for the server */ -void ioserver_get_conch (struct conch *); +void iohelp_get_conch (struct conch *); /* Handle a user request to release the conch (io_release_conch). */ -void ioserver_handle_io_release_conch (struct conch *, void *); +void iohelp_handle_io_release_conch (struct conch *, void *); /* Check if the user is allowed to make a shared-data notification message. */ -error_t ioserver_verify_user_conch (struct conch *, void *); +error_t iohelp_verify_user_conch (struct conch *, void *); /* This function must by defined by the server. It should transfer information from the current conch holder's shared page to the server's data (the arg is the conch owner). */ -void ioserver_fetch_shared_data (void *); +void iohelp_fetch_shared_data (void *); /* This function must be defined by the server. It should transfer information from the server's data to the current conch holder's shared page (the arg is the conch owner). */ -void ioserver_put_shared_data (void *); +void iohelp_put_shared_data (void *); #endif diff --git a/libiohelp/verify_user_conch.c b/libiohelp/verify_user_conch.c index 7a58a228..c7e3e62e 100644 --- a/libiohelp/verify_user_conch.c +++ b/libiohelp/verify_user_conch.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1993, 1994 Free Software Foundation + Copyright (C) 1993, 1994, 1996 Free Software Foundation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -15,13 +15,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "ioserver.h" +#include "iohelp.h" #include <errno.h> /* Check to see if the user identified by USER has conch C; if not, return an error, else, return 0. */ error_t -ioserver_verify_user_conch (struct conch *c, void *user) +iohelp_verify_user_conch (struct conch *c, void *user) { struct shared_io *user_sh; |