X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Fulnds%2Fproclib.c;h=1cfb233e97ff2af09b444925e0b45960c4fcd0b7;hp=c3ee103268aec08538fa8a24c95f9d8d60566fee;hb=090c677210ee2946d99c71412e4ff762bb300f4f;hpb=96ec6856f91f7f9031cfce4273c714d72cfe59ae diff --git a/lnet/ulnds/proclib.c b/lnet/ulnds/proclib.c index c3ee103..1cfb233 100644 --- a/lnet/ulnds/proclib.c +++ b/lnet/ulnds/proclib.c @@ -2,20 +2,21 @@ * vim:expandtab:shiftwidth=8:tabstop=8: * * Copyright (c) 2002 Cray Inc. + * Copyright (c) 2003 Cluster File Systems, Inc. * - * This file is part of Portals, http://www.sf.net/projects/sandiaportals/ + * This file is part of Lustre, http://www.lustre.org. * - * Portals is free software; you can redistribute it and/or - * modify it under the terms of version 2.1 of the GNU Lesser General - * Public License as published by the Free Software Foundation. + * Lustre is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. * - * Portals is distributed in the hope that it will be useful, + * Lustre is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with Portals; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with Lustre; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -31,41 +32,39 @@ #include #include #include -#include #include #include #include #include #include #include -//#include #include /* the following functions are stubs to satisfy the nal definition without doing anything particularily useful*/ -static int nal_write(nal_cb_t *nal, - void *private, - user_ptr dst_addr, - void *src_addr, - ptl_size_t len) +static ptl_err_t nal_write(nal_cb_t *nal, + void *private, + user_ptr dst_addr, + void *src_addr, + size_t len) { memcpy(dst_addr, src_addr, len); - return 0; + return PTL_OK; } -static int nal_read(nal_cb_t * nal, - void *private, - void *dst_addr, - user_ptr src_addr, - size_t len) +static ptl_err_t nal_read(nal_cb_t * nal, + void *private, + void *dst_addr, + user_ptr src_addr, + size_t len) { memcpy(dst_addr, src_addr, len); - return 0; + return PTL_OK; } static void *nal_malloc(nal_cb_t *nal, - ptl_size_t len) + size_t len) { void *buf = malloc(len); return buf; @@ -73,7 +72,7 @@ static void *nal_malloc(nal_cb_t *nal, static void nal_free(nal_cb_t *nal, void *buf, - ptl_size_t len) + size_t len) { free(buf); } @@ -93,14 +92,34 @@ static void nal_printf(nal_cb_t *nal, static void nal_cli(nal_cb_t *nal, unsigned long *flags) { + bridge b = (bridge) nal->nal_data; + procbridge p = (procbridge) b->local; + + pthread_mutex_lock(&p->mutex); } static void nal_sti(nal_cb_t *nal, unsigned long *flags) { + bridge b = (bridge)nal->nal_data; + procbridge p = (procbridge) b->local; + + pthread_mutex_unlock(&p->mutex); } +static void nal_callback(nal_cb_t *nal, void *private, + lib_eq_t *eq, ptl_event_t *ev) +{ + bridge b = (bridge)nal->nal_data; + procbridge p = (procbridge) b->local; + + /* holding p->mutex */ + if (eq->event_callback != NULL) + eq->event_callback(ev); + + pthread_cond_broadcast(&p->cond); +} static int nal_dist(nal_cb_t *nal, ptl_nid_t nid, @@ -108,69 +127,21 @@ static int nal_dist(nal_cb_t *nal, { return 0; } - - -/* Function: data_from_api - * Arguments: t: the nal state for this interface - * Returns: whether to continue reading from the pipe - * - * data_from_api() reads data from the api side in response - * to a select. - * - * We define data_failure() for syntactic convenience - * of unix error reporting. - */ - -#define data_failure(operand,fd,buffer,length)\ - if(syscall(SYS_##operand,fd,buffer,length)!=length){\ - lib_fini(b->nal_cb);\ - return(0);\ - } -static int data_from_api(void *arg) +static void check_stopping(void *z) { - bridge b = arg; - procbridge p=(procbridge)b->local; - /* where are these two sizes derived from ??*/ - char arg_block[ 256 ]; - char ret_block[ 128 ]; - ptl_size_t arg_len,ret_len; - int fd=p->to_lib[0]; - int index; - - data_failure(read,fd, &index, sizeof(index)); - - if (index==PTL_FINI) { - lib_fini(b->nal_cb); - if (b->shutdown) (*b->shutdown)(b); - syscall(SYS_write, p->from_lib[1],&b->alive,sizeof(b->alive)); - - /* a heavy-handed but convenient way of shutting down - the lower side thread */ - pthread_exit(0); - } - - data_failure(read,fd, &arg_len, sizeof(arg_len)); - data_failure(read,fd, &ret_len, sizeof(ret_len)); - data_failure(read,fd, arg_block, arg_len); - - lib_dispatch(b->nal_cb, NULL, index, arg_block, ret_block); - - data_failure(write,p->from_lib[1],ret_block, ret_len); - return(1); -} -#undef data_failure - - - -static void wakeup_topside(void *z) -{ - bridge b=z; - procbridge p=b->local; + bridge b = z; + procbridge p = b->local; + if ((p->nal_flags & NAL_FLAG_STOPPING) == 0) + return; + pthread_mutex_lock(&p->mutex); + p->nal_flags |= NAL_FLAG_STOPPED; pthread_cond_broadcast(&p->cond); pthread_mutex_unlock(&p->mutex); + + pthread_exit(0); } @@ -195,7 +166,8 @@ nal_initialize nal_table[PTL_IFACE_MAX]={0,tcpnal_init,0}; void *nal_thread(void *z) { - bridge b=z; + nal_init_args_t *args = (nal_init_args_t *) z; + bridge b = args->nia_bridge; procbridge p=b->local; int rc; ptl_pid_t pid_request; @@ -214,17 +186,12 @@ void *nal_thread(void *z) b->nal_cb->cb_printf=nal_printf; b->nal_cb->cb_cli=nal_cli; b->nal_cb->cb_sti=nal_sti; + b->nal_cb->cb_callback=nal_callback; b->nal_cb->cb_dist=nal_dist; - - register_io_handler(p->to_lib[0],READ_HANDLER,data_from_api,(void *)b); - - if(!(rc = syscall(SYS_read, p->to_lib[0], &pid_request, sizeof(pid_request)))) - perror("procbridge read from api"); - if(!(rc = syscall(SYS_read, p->to_lib[0], &desired, sizeof(ptl_ni_limits_t)))) - perror("procbridge read from api"); - if(!(rc = syscall(SYS_read, p->to_lib[0], &nal_type, sizeof(nal_type)))) - perror("procbridge read from api"); + pid_request = args->nia_requested_pid; + desired = *args->nia_limits; + nal_type = args->nia_nal_type; actual = desired; LIMIT(desired.max_match_entries,actual.max_match_entries,MAX_MES); @@ -251,20 +218,19 @@ void *nal_thread(void *z) * it is non-zero since something went wrong. */ /* this should perform error checking */ -#if 0 - write(p->from_lib[1], &actual, sizeof(ptl_ni_limits_t)); -#endif - syscall(SYS_write, p->from_lib[1], &rc, sizeof(rc)); - - if(!rc) { + pthread_mutex_lock(&p->mutex); + p->nal_flags |= rc ? NAL_FLAG_STOPPED : NAL_FLAG_RUNNING; + pthread_cond_broadcast(&p->cond); + pthread_mutex_unlock(&p->mutex); + + if (!rc) { /* the thunk function is called each time the timer loop performs an operation and returns to blocking mode. we overload this function to inform the api side that it may be interested in looking at the event queue */ - register_thunk(wakeup_topside,b); + register_thunk(check_stopping,b); timer_loop(); } return(0); } #undef LIMIT -