From ebad9d564a411bdddb1f2520cb6a5a4434a11be4 Mon Sep 17 00:00:00 2001 From: pjkirner Date: Thu, 1 Sep 2005 15:16:49 +0000 Subject: [PATCH] Reorganize LNET API files, so that PTLLND can include both LNET and PORTALS. --- lnet/include/libcfs/darwin/kp30.h | 2 +- lnet/include/libcfs/darwin/lltrace.h | 2 +- lnet/include/libcfs/linux/kp30.h | 2 +- lnet/include/libcfs/linux/lltrace.h | 2 +- lnet/include/lnet/Makefile.am | 4 +- lnet/include/lnet/api-support.h | 6 +- lnet/include/lnet/api.h | 4 +- lnet/include/lnet/build_check.h | 4 +- lnet/include/lnet/darwin/Makefile.am | 2 +- lnet/include/lnet/darwin/lib-lnet.h | 8 +- lnet/include/lnet/darwin/lib-p30.h | 14 - lnet/include/lnet/darwin/lib-types.h | 6 +- lnet/include/lnet/darwin/lnet.h | 10 +- lnet/include/lnet/darwin/p30.h | 20 -- lnet/include/lnet/errno.h | 11 - lnet/include/lnet/lib-lnet.h | 12 +- lnet/include/lnet/lib-p30.h | 505 ----------------------------------- lnet/include/lnet/lib-types.h | 4 +- lnet/include/lnet/linux/Makefile.am | 2 +- lnet/include/lnet/linux/lib-lnet.h | 8 +- lnet/include/lnet/linux/lib-p30.h | 20 -- lnet/include/lnet/linux/lib-types.h | 6 +- lnet/include/lnet/linux/lnet.h | 10 +- lnet/include/lnet/linux/p30.h | 25 -- lnet/include/lnet/lnet.h | 10 +- lnet/include/lnet/p30.h | 25 -- lnet/include/lnet/ptlctl.h | 85 ------ lnet/include/lnet/types.h | 5 +- lnet/klnds/gmlnd/gmlnd.h | 4 +- lnet/klnds/iiblnd/iiblnd.h | 4 +- lnet/klnds/openiblnd/openiblnd.h | 4 +- lnet/klnds/qswlnd/qswlnd.h | 4 +- lnet/klnds/ralnd/ralnd.h | 4 +- lnet/klnds/socklnd/socklnd.h | 4 +- lnet/klnds/viblnd/viblnd.h | 4 +- lnet/libcfs/module.c | 4 +- lnet/libcfs/nidstrings.c | 2 +- lnet/lnet/acceptor.c | 2 +- lnet/lnet/api-ni.c | 2 +- lnet/lnet/config.c | 2 +- lnet/lnet/lib-eq.c | 2 +- lnet/lnet/lib-md.c | 2 +- lnet/lnet/lib-me.c | 2 +- lnet/lnet/lib-move.c | 2 +- lnet/lnet/lib-msg.c | 2 +- lnet/lnet/lo.c | 2 +- lnet/lnet/module.c | 2 +- lnet/lnet/router.h | 2 +- lnet/tests/ping.h | 2 +- lnet/tests/ping_cli.c | 2 +- lnet/tests/ping_srv.c | 2 +- lnet/tests/sping_cli.c | 2 +- lnet/tests/sping_srv.c | 2 +- lnet/ulnds/bridge.h | 2 +- lnet/ulnds/socklnd/bridge.h | 2 +- lnet/utils/debug.c | 2 +- lnet/utils/debugctl.c | 2 +- lnet/utils/l_ioctl.c | 2 +- lnet/utils/portals.c | 2 +- lnet/utils/ptlctl.c | 2 +- lnet/utils/wirecheck.c | 2 +- 61 files changed, 95 insertions(+), 801 deletions(-) delete mode 100644 lnet/include/lnet/darwin/lib-p30.h delete mode 100644 lnet/include/lnet/darwin/p30.h delete mode 100644 lnet/include/lnet/errno.h delete mode 100644 lnet/include/lnet/lib-p30.h delete mode 100644 lnet/include/lnet/linux/lib-p30.h delete mode 100644 lnet/include/lnet/linux/p30.h delete mode 100644 lnet/include/lnet/p30.h delete mode 100644 lnet/include/lnet/ptlctl.h diff --git a/lnet/include/libcfs/darwin/kp30.h b/lnet/include/libcfs/darwin/kp30.h index ace7f68..50f3fd3 100644 --- a/lnet/include/libcfs/darwin/kp30.h +++ b/lnet/include/libcfs/darwin/kp30.h @@ -22,7 +22,7 @@ #include #include -#include +#include #define our_cond_resched() schedule_timeout(1); diff --git a/lnet/include/libcfs/darwin/lltrace.h b/lnet/include/libcfs/darwin/lltrace.h index d65e54c..31d6e17 100644 --- a/lnet/include/libcfs/darwin/lltrace.h +++ b/lnet/include/libcfs/darwin/lltrace.h @@ -21,6 +21,6 @@ #include #include #include -#include +#include #endif diff --git a/lnet/include/libcfs/linux/kp30.h b/lnet/include/libcfs/linux/kp30.h index d0e0d67..db95ab1 100644 --- a/lnet/include/libcfs/linux/kp30.h +++ b/lnet/include/libcfs/linux/kp30.h @@ -30,7 +30,7 @@ # include # include # include -# include +# include # include # include # include diff --git a/lnet/include/libcfs/linux/lltrace.h b/lnet/include/libcfs/linux/lltrace.h index d1fa7ae..1ddd03d 100644 --- a/lnet/include/libcfs/linux/lltrace.h +++ b/lnet/include/libcfs/linux/lltrace.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lnet/include/lnet/Makefile.am b/lnet/include/lnet/Makefile.am index 4a0a96b..dff5bee 100644 --- a/lnet/include/lnet/Makefile.am +++ b/lnet/include/lnet/Makefile.am @@ -6,5 +6,5 @@ SUBDIRS += darwin endif DIST_SUBDIRS := $(SUBDIRS) -EXTRA_DIST = api.h api-support.h build_check.h errno.h \ - lib-p30.h lib-types.h p30.h ptlctl.h socklnd.h types.h +EXTRA_DIST = api.h api-support.h build_check.h \ + lib-lnet.h lib-types.h lnet.h lnetctl.h socklnd.h types.h diff --git a/lnet/include/lnet/api-support.h b/lnet/include/lnet/api-support.h index ff76a21..30f62e1 100644 --- a/lnet/include/lnet/api-support.h +++ b/lnet/include/lnet/api-support.h @@ -1,5 +1,5 @@ -#ifndef __API_SUPPORT_H__ -#define __API_SUPPORT_H__ +#ifndef __LNET_API_SUPPORT_H__ +#define __LNET_API_SUPPORT_H__ #include "build_check.h" #ifndef __KERNEL__ @@ -11,6 +11,6 @@ #include #include -#include +#include #endif diff --git a/lnet/include/lnet/api.h b/lnet/include/lnet/api.h index 127c75d..709caaa 100644 --- a/lnet/include/lnet/api.h +++ b/lnet/include/lnet/api.h @@ -1,5 +1,5 @@ -#ifndef P30_API_H -#define P30_API_H +#ifndef __LNET_API_H__ +#define __LNET_API_H__ #include "build_check.h" diff --git a/lnet/include/lnet/build_check.h b/lnet/include/lnet/build_check.h index c219d2a..34d0890 100644 --- a/lnet/include/lnet/build_check.h +++ b/lnet/include/lnet/build_check.h @@ -1,5 +1,5 @@ -#ifndef _BUILD_CHECK_H -#define _BUILD_CHECK_H +#ifndef __LNET_BUILD_CHECK_H__ +#define __LNET_BUILD_CHECK_H__ #if CRAY_PORTALS #error "an application got to me instead of cray's includes" diff --git a/lnet/include/lnet/darwin/Makefile.am b/lnet/include/lnet/darwin/Makefile.am index b6e7daf..c3b2e2c 100644 --- a/lnet/include/lnet/darwin/Makefile.am +++ b/lnet/include/lnet/darwin/Makefile.am @@ -1 +1 @@ -EXTRA_DIST := lib-p30.h lib-types.h p30.h +EXTRA_DIST := lib-lnet.h lib-types.h lnet.h diff --git a/lnet/include/lnet/darwin/lib-lnet.h b/lnet/include/lnet/darwin/lib-lnet.h index 7c2838a..a017d6f 100644 --- a/lnet/include/lnet/darwin/lib-lnet.h +++ b/lnet/include/lnet/darwin/lib-lnet.h @@ -1,11 +1,11 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: */ -#ifndef __PORTALS_DARWIN_LIB_P30_H__ -#define __PORTALS_DARWIN_LIB_P30_H__ +#ifndef __LNET_DARWIN_LIB_LNET_H__ +#define __LNET_DARWIN_LIB_LNET_H__ -#ifndef __PORTALS_LIB_P30_H__ -#error Do not #include this file directly. #include instead +#ifndef __LNET_LIB_LNET_H__ +#error Do not #include this file directly. #include instead #endif #include diff --git a/lnet/include/lnet/darwin/lib-p30.h b/lnet/include/lnet/darwin/lib-p30.h deleted file mode 100644 index 7c2838a..0000000 --- a/lnet/include/lnet/darwin/lib-p30.h +++ /dev/null @@ -1,14 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - */ -#ifndef __PORTALS_DARWIN_LIB_P30_H__ -#define __PORTALS_DARWIN_LIB_P30_H__ - -#ifndef __PORTALS_LIB_P30_H__ -#error Do not #include this file directly. #include instead -#endif - -#include -#include - -#endif diff --git a/lnet/include/lnet/darwin/lib-types.h b/lnet/include/lnet/darwin/lib-types.h index 19ad4b2..7e6257b 100644 --- a/lnet/include/lnet/darwin/lib-types.h +++ b/lnet/include/lnet/darwin/lib-types.h @@ -1,10 +1,10 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: */ -#ifndef __PORTALS_DARWIN_LIB_TYPES_H__ -#define __PORTALS_DARWIN_LIB_TYPES_H__ +#ifndef __LNET_DARWIN_LIB_TYPES_H__ +#define __LNET_DARWIN_LIB_TYPES_H__ -#ifndef __PORTALS_LIB_TYPES_H__ +#ifndef __LNET_LIB_TYPES_H__ #error Do not #include this file directly. #include instead #endif diff --git a/lnet/include/lnet/darwin/lnet.h b/lnet/include/lnet/darwin/lnet.h index fab937c..82a6127 100644 --- a/lnet/include/lnet/darwin/lnet.h +++ b/lnet/include/lnet/darwin/lnet.h @@ -1,15 +1,15 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: */ -#ifndef _PORTALS_DARWIN_P30_H_ -#define _PORTALS_DARWIN_P30_H_ +#ifndef __LNET_DARWIN_LNET_H__ +#define __LNET_DARWIN_LNET_H__ -#ifndef __PORTALS_P30_H__ -#error Do not #include this file directly. #include instead +#ifndef __LNET_H__ +#error Do not #include this file directly. #include instead #endif /* - * p30.h + * lnet.h * * User application interface file */ diff --git a/lnet/include/lnet/darwin/p30.h b/lnet/include/lnet/darwin/p30.h deleted file mode 100644 index fab937c..0000000 --- a/lnet/include/lnet/darwin/p30.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - */ -#ifndef _PORTALS_DARWIN_P30_H_ -#define _PORTALS_DARWIN_P30_H_ - -#ifndef __PORTALS_P30_H__ -#error Do not #include this file directly. #include instead -#endif - -/* - * p30.h - * - * User application interface file - */ - -#include -#include - -#endif diff --git a/lnet/include/lnet/errno.h b/lnet/include/lnet/errno.h deleted file mode 100644 index 4f9105f..0000000 --- a/lnet/include/lnet/errno.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef _P30_ERRNO_H_ -#define _P30_ERRNO_H_ - -#include "build_check.h" -/* - * include/portals/errno.h - * - * Shared error number lists - */ - -#endif diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h index 1e8f8f0..abd2080 100644 --- a/lnet/include/lnet/lib-lnet.h +++ b/lnet/include/lnet/lib-lnet.h @@ -1,27 +1,27 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * lib-p30.h + * lib-lnet.h * * Top level include for library side routines */ -#ifndef __PORTALS_LIB_P30_H__ -#define __PORTALS_LIB_P30_H__ +#ifndef __LNET_LIB_LNET_H__ +#define __LNET_LIB_LNET_H__ #include "build_check.h" #if defined(__linux__) -#include +#include #elif defined(__APPLE__) -#include +#include #else #error Unsupported Operating System #endif #include #include -#include +#include #include extern ptl_apini_t ptl_apini; /* THE network interface (at the API) */ diff --git a/lnet/include/lnet/lib-p30.h b/lnet/include/lnet/lib-p30.h deleted file mode 100644 index 1e8f8f0..0000000 --- a/lnet/include/lnet/lib-p30.h +++ /dev/null @@ -1,505 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * - * lib-p30.h - * - * Top level include for library side routines - */ - -#ifndef __PORTALS_LIB_P30_H__ -#define __PORTALS_LIB_P30_H__ - -#include "build_check.h" - -#if defined(__linux__) -#include -#elif defined(__APPLE__) -#include -#else -#error Unsupported Operating System -#endif - -#include -#include -#include -#include - -extern ptl_apini_t ptl_apini; /* THE network interface (at the API) */ - -static inline int ptl_is_wire_handle_none (ptl_handle_wire_t *wh) -{ - return (wh->wh_interface_cookie == PTL_WIRE_HANDLE_NONE.wh_interface_cookie && - wh->wh_object_cookie == PTL_WIRE_HANDLE_NONE.wh_object_cookie); -} - -static inline int ptl_md_exhausted (ptl_libmd_t *md) -{ - return (md->md_threshold == 0 || - ((md->md_options & LNET_MD_MAX_SIZE) != 0 && - md->md_offset + md->md_max_size > md->md_length)); -} - -#ifdef __KERNEL__ -#define PTL_LOCK(flags) \ - spin_lock_irqsave(&ptl_apini.apini_lock, flags) -#define PTL_UNLOCK(flags) \ - spin_unlock_irqrestore(&ptl_apini.apini_lock, flags) -#define PTL_MUTEX_DOWN(m) mutex_down(m) -#define PTL_MUTEX_UP(m) mutex_up(m) -#else -#define PTL_LOCK(flags) \ - (pthread_mutex_lock(&ptl_apini.apini_mutex), (flags) = 0) -#define PTL_UNLOCK(flags) \ - pthread_mutex_unlock(&ptl_apini.apini_mutex) -#define PTL_MUTEX_DOWN(m) pthread_mutex_lock(m) -#define PTL_MUTEX_UP(m) pthread_mutex_unlock(m) -#endif - -#ifdef PTL_USE_LIB_FREELIST - -#define MAX_MES 2048 -#define MAX_MDS 2048 -#define MAX_MSGS 2048 /* Outstanding messages */ -#define MAX_EQS 512 - -static inline void * -ptl_freelist_alloc (ptl_freelist_t *fl) -{ - /* ALWAYS called with liblock held */ - ptl_freeobj_t *o; - - if (list_empty (&fl->fl_list)) - return (NULL); - - o = list_entry (fl->fl_list.next, ptl_freeobj_t, fo_list); - list_del (&o->fo_list); - return ((void *)&o->fo_contents); -} - -static inline void -ptl_freelist_free (ptl_freelist_t *fl, void *obj) -{ - /* ALWAYS called with liblock held */ - ptl_freeobj_t *o = list_entry (obj, ptl_freeobj_t, fo_contents); - - list_add (&o->fo_list, &fl->fl_list); -} - - -static inline ptl_eq_t * -ptl_eq_alloc (void) -{ - /* NEVER called with liblock held */ - unsigned long flags; - ptl_eq_t *eq; - - PTL_LOCK(flags); - eq = (ptl_eq_t *)ptl_freelist_alloc(&ptl_apini.apini_free_eqs); - PTL_UNLOCK(flags); - - return (eq); -} - -static inline void -ptl_eq_free (ptl_eq_t *eq) -{ - /* ALWAYS called with liblock held */ - ptl_freelist_free(&ptl_apini.apini_free_eqs, eq); -} - -static inline ptl_libmd_t * -ptl_md_alloc (lnet_md_t *umd) -{ - /* NEVER called with liblock held */ - unsigned long flags; - ptl_libmd_t *md; - - PTL_LOCK(flags); - md = (ptl_libmd_t *)ptl_freelist_alloc(&ptl_apini.apini_free_mds); - PTL_UNLOCK(flags); - - return (md); -} - -static inline void -ptl_md_free (ptl_libmd_t *md) -{ - /* ALWAYS called with liblock held */ - ptl_freelist_free (&ptl_apini.apini_free_mds, md); -} - -static inline ptl_me_t * -ptl_me_alloc (void) -{ - /* NEVER called with liblock held */ - unsigned long flags; - ptl_me_t *me; - - PTL_LOCK(flags); - me = (ptl_me_t *)ptl_freelist_alloc(&ptl_apini.apini_free_mes); - PTL_UNLOCK(flags); - - return (me); -} - -static inline void -ptl_me_free (ptl_me_t *me) -{ - /* ALWAYS called with liblock held */ - ptl_freelist_free (&ptl_apini.apini_free_mes, me); -} - -static inline ptl_msg_t * -ptl_msg_alloc (void) -{ - /* NEVER called with liblock held */ - unsigned long flags; - ptl_msg_t *msg; - - PTL_LOCK(flags); - msg = (ptl_msg_t *)ptl_freelist_alloc(&ptl_apini.apini_free_msgs); - PTL_UNLOCK(flags); - - if (msg != NULL) { - /* NULL pointers, clear flags etc */ - memset (msg, 0, sizeof (*msg)); - msg->msg_ack_wmd = PTL_WIRE_HANDLE_NONE; - } - return(msg); -} - -static inline void -ptl_msg_free (ptl_msg_t *msg) -{ - /* ALWAYS called with liblock held */ - ptl_freelist_free(&ptl_apini.apini_free_msgs, msg); -} - -#else - -static inline ptl_eq_t * -ptl_eq_alloc (void) -{ - /* NEVER called with liblock held */ - ptl_eq_t *eq; - - PORTAL_ALLOC(eq, sizeof(*eq)); - return (eq); -} - -static inline void -ptl_eq_free (ptl_eq_t *eq) -{ - /* ALWAYS called with liblock held */ - PORTAL_FREE(eq, sizeof(*eq)); -} - -static inline ptl_libmd_t * -ptl_md_alloc (lnet_md_t *umd) -{ - /* NEVER called with liblock held */ - ptl_libmd_t *md; - int size; - int niov; - - if ((umd->options & LNET_MD_KIOV) != 0) { - niov = umd->length; - size = offsetof(ptl_libmd_t, md_iov.kiov[niov]); - } else { - niov = ((umd->options & LNET_MD_IOVEC) != 0) ? - umd->length : 1; - size = offsetof(ptl_libmd_t, md_iov.iov[niov]); - } - - PORTAL_ALLOC(md, size); - - if (md != NULL) { - /* Set here in case of early free */ - md->md_options = umd->options; - md->md_niov = niov; - } - - return (md); -} - -static inline void -ptl_md_free (ptl_libmd_t *md) -{ - /* ALWAYS called with liblock held */ - int size; - - if ((md->md_options & LNET_MD_KIOV) != 0) - size = offsetof(ptl_libmd_t, md_iov.kiov[md->md_niov]); - else - size = offsetof(ptl_libmd_t, md_iov.iov[md->md_niov]); - - PORTAL_FREE(md, size); -} - -static inline ptl_me_t * -ptl_me_alloc (void) -{ - /* NEVER called with liblock held */ - ptl_me_t *me; - - PORTAL_ALLOC(me, sizeof(*me)); - return (me); -} - -static inline void -ptl_me_free(ptl_me_t *me) -{ - /* ALWAYS called with liblock held */ - PORTAL_FREE(me, sizeof(*me)); -} - -static inline ptl_msg_t * -ptl_msg_alloc(void) -{ - /* NEVER called with liblock held; may be in interrupt... */ - ptl_msg_t *msg; - - if (in_interrupt()) - PORTAL_ALLOC_ATOMIC(msg, sizeof(*msg)); - else - PORTAL_ALLOC(msg, sizeof(*msg)); - - if (msg != NULL) { - /* NULL pointers, clear flags etc */ - memset (msg, 0, sizeof (*msg)); - msg->msg_ack_wmd = PTL_WIRE_HANDLE_NONE; - } - return (msg); -} - -static inline void -ptl_msg_free(ptl_msg_t *msg) -{ - /* ALWAYS called with liblock held */ - PORTAL_FREE(msg, sizeof(*msg)); -} -#endif - -extern ptl_libhandle_t *ptl_lookup_cookie (__u64 cookie, int type); -extern void ptl_initialise_handle (ptl_libhandle_t *lh, int type); -extern void ptl_invalidate_handle (ptl_libhandle_t *lh); - -static inline void -ptl_eq2handle (lnet_handle_eq_t *handle, ptl_eq_t *eq) -{ - if (eq == NULL) { - *handle = LNET_EQ_NONE; - return; - } - - handle->cookie = eq->eq_lh.lh_cookie; -} - -static inline ptl_eq_t * -ptl_handle2eq (lnet_handle_eq_t *handle) -{ - /* ALWAYS called with liblock held */ - ptl_libhandle_t *lh = ptl_lookup_cookie (handle->cookie, - PTL_COOKIE_TYPE_EQ); - if (lh == NULL) - return (NULL); - - return (lh_entry (lh, ptl_eq_t, eq_lh)); -} - -static inline void -ptl_md2handle (lnet_handle_md_t *handle, ptl_libmd_t *md) -{ - handle->cookie = md->md_lh.lh_cookie; -} - -static inline ptl_libmd_t * -ptl_handle2md (lnet_handle_md_t *handle) -{ - /* ALWAYS called with liblock held */ - ptl_libhandle_t *lh = ptl_lookup_cookie (handle->cookie, - PTL_COOKIE_TYPE_MD); - if (lh == NULL) - return (NULL); - - return (lh_entry (lh, ptl_libmd_t, md_lh)); -} - -static inline ptl_libmd_t * -ptl_wire_handle2md (ptl_handle_wire_t *wh) -{ - /* ALWAYS called with liblock held */ - ptl_libhandle_t *lh; - - if (wh->wh_interface_cookie != ptl_apini.apini_interface_cookie) - return (NULL); - - lh = ptl_lookup_cookie (wh->wh_object_cookie, - PTL_COOKIE_TYPE_MD); - if (lh == NULL) - return (NULL); - - return (lh_entry (lh, ptl_libmd_t, md_lh)); -} - -static inline void -ptl_me2handle (lnet_handle_me_t *handle, ptl_me_t *me) -{ - handle->cookie = me->me_lh.lh_cookie; -} - -static inline ptl_me_t * -ptl_handle2me (lnet_handle_me_t *handle) -{ - /* ALWAYS called with liblock held */ - ptl_libhandle_t *lh = ptl_lookup_cookie (handle->cookie, - PTL_COOKIE_TYPE_ME); - if (lh == NULL) - return (NULL); - - return (lh_entry (lh, ptl_me_t, me_lh)); -} - -/******************************************************************************/ -/* Portals Router */ - -/* NI APIs */ -int kpr_forwarding(void); -lnet_nid_t kpr_lookup(ptl_ni_t **ni, lnet_nid_t nid, int nob); -void kpr_fwd_start(ptl_ni_t *ni, kpr_fwd_desc_t *fwd); -void kpr_fwd_done(ptl_ni_t *ni, kpr_fwd_desc_t *fwd, int error); -int kpr_notify(ptl_ni_t *ni, lnet_nid_t peer, int alive, time_t when); - -/* internal APIs */ -int kpr_ctl(unsigned int cmd, void *arg); -int kpr_add_route(__u32 net, lnet_nid_t gateway_nid); -int kpr_initialise(void); -void kpr_finalise(void); - -static inline void -kpr_fwd_init (kpr_fwd_desc_t *fwd, lnet_nid_t target_nid, - lnet_nid_t sender_nid, lnet_nid_t source_nid, - ptl_hdr_t *hdr, int nob, int niov, lnet_kiov_t *kiov, - kpr_fwd_callback_t callback, void *callback_arg) -{ - fwd->kprfd_target_nid = target_nid; - fwd->kprfd_gateway_nid = target_nid; - fwd->kprfd_sender_nid = sender_nid; - fwd->kprfd_source_nid = source_nid; - fwd->kprfd_hdr = hdr; - fwd->kprfd_nob = nob; - fwd->kprfd_niov = niov; - fwd->kprfd_kiov = kiov; - fwd->kprfd_callback = callback; - fwd->kprfd_callback_arg = callback_arg; -} - -/******************************************************************************/ - -static inline void -ptl_ni_addref_locked(ptl_ni_t *ni) -{ - LASSERT (ni->ni_refcount > 0); - ni->ni_refcount++; -} - -static inline void -ptl_ni_addref(ptl_ni_t *ni) -{ - unsigned long flags; - - PTL_LOCK(flags); - ptl_ni_addref_locked(ni); - PTL_UNLOCK(flags); -} - -static inline void -ptl_ni_decref_locked(ptl_ni_t *ni) -{ - LASSERT (ni->ni_refcount > 0); - ni->ni_refcount--; - if (ni->ni_refcount == 0) - list_add_tail(&ni->ni_list, &ptl_apini.apini_zombie_nis); -} - -static inline void -ptl_ni_decref(ptl_ni_t *ni) -{ - unsigned long flags; - - PTL_LOCK(flags); - ptl_ni_decref_locked(ni); - PTL_UNLOCK(flags); -} - -extern ptl_nal_t ptl_lonal; -extern ptl_ni_t *ptl_loni; - -extern int ptl_get_apinih (lnet_handle_ni_t *nih); - -extern ptl_ni_t *ptl_net2ni (__u32 net); -extern int ptl_islocalnid (lnet_nid_t nid); -extern void ptl_enq_event_locked (void *private, - ptl_eq_t *eq, lnet_event_t *ev); -extern void ptl_finalize (ptl_ni_t *ni, void *private, ptl_msg_t *msg, - lnet_ni_fail_t ni_fail_type); -extern int ptl_parse (ptl_ni_t *ni, ptl_hdr_t *hdr, void *private); -extern ptl_msg_t *ptl_create_reply_msg (ptl_ni_t *ni, lnet_nid_t peer_nid, - ptl_msg_t *get_msg); -extern void ptl_print_hdr (ptl_hdr_t * hdr); -extern int ptl_fail_nid(lnet_nid_t nid, unsigned int threshold); - -extern lnet_size_t ptl_iov_nob (int niov, struct iovec *iov); -extern void ptl_copy_iov2buf (char *dest, int niov, struct iovec *iov, - lnet_size_t offset, lnet_size_t len); -extern void ptl_copy_buf2iov (int niov, struct iovec *iov, lnet_size_t offset, - char *src, lnet_size_t len); -extern int ptl_extract_iov (int dst_niov, struct iovec *dst, - int src_niov, struct iovec *src, - lnet_size_t offset, lnet_size_t len); - -extern lnet_size_t ptl_kiov_nob (int niov, lnet_kiov_t *iov); -extern void ptl_copy_kiov2buf (char *dest, int niov, lnet_kiov_t *kiov, - lnet_size_t offset, lnet_size_t len); -extern void ptl_copy_buf2kiov (int niov, lnet_kiov_t *kiov, lnet_size_t offset, - char *src, lnet_size_t len); -extern int ptl_extract_kiov (int dst_niov, lnet_kiov_t *dst, - int src_niov, lnet_kiov_t *src, - lnet_size_t offset, lnet_size_t len); - -extern lnet_pid_t ptl_getpid(void); - -extern int ptl_recv (ptl_ni_t *ni, void *private, ptl_msg_t *msg, ptl_libmd_t *md, - lnet_size_t offset, lnet_size_t mlen, lnet_size_t rlen); -extern int ptl_send (ptl_ni_t *ni, void *private, ptl_msg_t *msg, - ptl_hdr_t *hdr, int type, lnet_process_id_t target, - ptl_libmd_t *md, lnet_size_t offset, lnet_size_t len); - -extern void ptl_me_unlink(ptl_me_t *me); - -extern void ptl_md_unlink(ptl_libmd_t *md); -extern void ptl_md_deconstruct(ptl_libmd_t *lmd, lnet_md_t *umd); - -extern void ptl_register_nal(ptl_nal_t *nal); -extern void ptl_unregister_nal(ptl_nal_t *nal); -extern int ptl_set_ip_niaddr (ptl_ni_t *ni); - -#ifdef __KERNEL__ -extern int ptl_connect(struct socket **sockp, lnet_nid_t peer_nid, - __u32 local_ip, __u32 peer_ip, int peer_port); -extern void ptl_connect_console_error(int rc, lnet_nid_t peer_nid, - __u32 peer_ip, int port); - -extern int ptl_count_acceptor_nis(ptl_ni_t **first_ni); - -extern int ptl_accept(ptl_ni_t *blind_ni, struct socket *sock, __u32 magic); -extern int ptl_acceptor_timeout(void); -extern int ptl_acceptor_port(void); -#endif -extern int ptl_acceptor_start(void); -extern void ptl_acceptor_stop(void); - -extern int ptl_parse_routes (char *route_str); -extern int ptl_parse_networks (struct list_head *nilist, char *networks); - -#endif diff --git a/lnet/include/lnet/lib-types.h b/lnet/include/lnet/lib-types.h index baf8de4..1c4bda6 100644 --- a/lnet/include/lnet/lib-types.h +++ b/lnet/include/lnet/lib-types.h @@ -7,8 +7,8 @@ * exposed to the user application */ -#ifndef __PORTALS_LIB_TYPES_H__ -#define __PORTALS_LIB_TYPES_H__ +#ifndef __LNET_LIB_TYPES_H__ +#define __LNET_LIB_TYPES_H__ #include "build_check.h" diff --git a/lnet/include/lnet/linux/Makefile.am b/lnet/include/lnet/linux/Makefile.am index b6e7daf..c3b2e2c 100644 --- a/lnet/include/lnet/linux/Makefile.am +++ b/lnet/include/lnet/linux/Makefile.am @@ -1 +1 @@ -EXTRA_DIST := lib-p30.h lib-types.h p30.h +EXTRA_DIST := lib-lnet.h lib-types.h lnet.h diff --git a/lnet/include/lnet/linux/lib-lnet.h b/lnet/include/lnet/linux/lib-lnet.h index 77463bc..ced91b5 100644 --- a/lnet/include/lnet/linux/lib-lnet.h +++ b/lnet/include/lnet/linux/lib-lnet.h @@ -1,11 +1,11 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: */ -#ifndef __PORTALS_LINUX_LIB_P30_H__ -#define __PORTALS_LINUX_LIB_P30_H__ +#ifndef __LNET_LINUX_LIB_LNET_H__ +#define __LNET_LINUX_LIB_LNET_H__ -#ifndef __PORTALS_LIB_P30_H__ -#error Do not #include this file directly. #include instead +#ifndef __LNET_LIB_LNET_H__ +#error Do not #include this file directly. #include instead #endif #ifdef __KERNEL__ diff --git a/lnet/include/lnet/linux/lib-p30.h b/lnet/include/lnet/linux/lib-p30.h deleted file mode 100644 index 77463bc..0000000 --- a/lnet/include/lnet/linux/lib-p30.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - */ -#ifndef __PORTALS_LINUX_LIB_P30_H__ -#define __PORTALS_LINUX_LIB_P30_H__ - -#ifndef __PORTALS_LIB_P30_H__ -#error Do not #include this file directly. #include instead -#endif - -#ifdef __KERNEL__ -# include -# include -#else -# include -# include -# include -#endif - -#endif diff --git a/lnet/include/lnet/linux/lib-types.h b/lnet/include/lnet/linux/lib-types.h index 281a8c2..7baff36 100644 --- a/lnet/include/lnet/linux/lib-types.h +++ b/lnet/include/lnet/linux/lib-types.h @@ -1,10 +1,10 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: */ -#ifndef __PORTALS_LINUX_LIB_TYPES_H__ -#define __PORTALS_LINUX_LIB_TYPES_H__ +#ifndef __LNET_LINUX_LIB_TYPES_H__ +#define __LNET_LINUX_LIB_TYPES_H__ -#ifndef __PORTALS_LIB_TYPES_H__ +#ifndef __LNET_LIB_TYPES_H__ #error Do not #include this file directly. #include instead #endif diff --git a/lnet/include/lnet/linux/lnet.h b/lnet/include/lnet/linux/lnet.h index 90a8848..b1aab84 100644 --- a/lnet/include/lnet/linux/lnet.h +++ b/lnet/include/lnet/linux/lnet.h @@ -1,15 +1,15 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: */ -#ifndef __PORTALS_LINUX_P30_H__ -#define __PORTALS_LINUX_P30_H__ +#ifndef __LNET_LINUX_LNET_H__ +#define __LNET_LINUX_LNET_H__ -#ifndef __PORTALS_P30_H__ -#error Do not #include this file directly. #include instead +#ifndef __LNET_H__ +#error Do not #include this file directly. #include instead #endif /* - * p30.h + * lnet.h * * User application interface file */ diff --git a/lnet/include/lnet/linux/p30.h b/lnet/include/lnet/linux/p30.h deleted file mode 100644 index 90a8848..0000000 --- a/lnet/include/lnet/linux/p30.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - */ -#ifndef __PORTALS_LINUX_P30_H__ -#define __PORTALS_LINUX_P30_H__ - -#ifndef __PORTALS_P30_H__ -#error Do not #include this file directly. #include instead -#endif - -/* - * p30.h - * - * User application interface file - */ - -#if defined (__KERNEL__) -#include -#include -#else -#include -#include -#endif - -#endif diff --git a/lnet/include/lnet/lnet.h b/lnet/include/lnet/lnet.h index a0c33c3..fce0f71 100644 --- a/lnet/include/lnet/lnet.h +++ b/lnet/include/lnet/lnet.h @@ -1,20 +1,20 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: */ -#ifndef __PORTALS_P30_H__ -#define __PORTALS_P30_H__ +#ifndef __LNET_H__ +#define __LNET_H__ #include "build_check.h" /* - * p30.h + * lnet.h * * User application interface file */ #if defined(__linux__) -#include +#include #elif defined(__APPLE__) -#include +#include #else #error Unsupported Operating System #endif diff --git a/lnet/include/lnet/p30.h b/lnet/include/lnet/p30.h deleted file mode 100644 index a0c33c3..0000000 --- a/lnet/include/lnet/p30.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - */ -#ifndef __PORTALS_P30_H__ -#define __PORTALS_P30_H__ - -#include "build_check.h" - -/* - * p30.h - * - * User application interface file - */ -#if defined(__linux__) -#include -#elif defined(__APPLE__) -#include -#else -#error Unsupported Operating System -#endif - -#include -#include - -#endif diff --git a/lnet/include/lnet/ptlctl.h b/lnet/include/lnet/ptlctl.h deleted file mode 100644 index 4b5b920..0000000 --- a/lnet/include/lnet/ptlctl.h +++ /dev/null @@ -1,85 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * - * This file is part of Portals, http://www.sf.net/projects/lustre/ - * - * Portals 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, - * 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 Portals; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * header for libptlctl.a - */ -#ifndef _PTLCTL_H_ -#define _PTLCTL_H_ - -#include -#include -#include - -#define PORTALS_DEV_ID 0 -#define PORTALS_DEV_PATH "/dev/portals" -#define OBD_DEV_ID 1 -#define OBD_DEV_PATH "/dev/obd" -#define SMFS_DEV_ID 2 -#define SMFS_DEV_PATH "/dev/snapdev" - -int ptl_initialize(int argc, char **argv); -int jt_ptl_network(int argc, char **argv); -int jt_ptl_print_interfaces(int argc, char **argv); -int jt_ptl_add_interface(int argc, char **argv); -int jt_ptl_del_interface(int argc, char **argv); -int jt_ptl_print_peers (int argc, char **argv); -int jt_ptl_add_peer (int argc, char **argv); -int jt_ptl_del_peer (int argc, char **argv); -int jt_ptl_print_connections (int argc, char **argv); -int jt_ptl_disconnect(int argc, char **argv); -int jt_ptl_push_connection(int argc, char **argv); -int jt_ptl_print_active_txs(int argc, char **argv); -int jt_ptl_ping(int argc, char **argv); -int jt_ptl_mynid(int argc, char **argv); -int jt_ptl_add_uuid(int argc, char **argv); -int jt_ptl_add_uuid_old(int argc, char **argv); /* backwards compatibility */ -int jt_ptl_close_uuid(int argc, char **argv); -int jt_ptl_del_uuid(int argc, char **argv); -int jt_ptl_add_route (int argc, char **argv); -int jt_ptl_del_route (int argc, char **argv); -int jt_ptl_notify_router (int argc, char **argv); -int jt_ptl_print_routes (int argc, char **argv); -int jt_ptl_fail_nid (int argc, char **argv); -int jt_ptl_lwt(int argc, char **argv); -int jt_ptl_memhog(int argc, char **argv); - -int dbg_initialize(int argc, char **argv); -int jt_dbg_filter(int argc, char **argv); -int jt_dbg_show(int argc, char **argv); -int jt_dbg_list(int argc, char **argv); -int jt_dbg_debug_kernel(int argc, char **argv); -int jt_dbg_debug_daemon(int argc, char **argv); -int jt_dbg_debug_file(int argc, char **argv); -int jt_dbg_clear_debug_buf(int argc, char **argv); -int jt_dbg_mark_debug_buf(int argc, char **argv); -int jt_dbg_modules(int argc, char **argv); -int jt_dbg_panic(int argc, char **argv); - -/* l_ioctl.c */ -typedef int (ioc_handler_t)(int dev_id, unsigned int opc, void *buf); -void set_ioc_handler(ioc_handler_t *handler); -int register_ioc_dev(int dev_id, const char * dev_name); -void unregister_ioc_dev(int dev_id); -int set_ioctl_dump(char * file); -int l_ioctl(int dev_id, unsigned int opc, void *buf); -int parse_dump(char * dump_file, ioc_handler_t ioc_func); -int jt_ioc_dump(int argc, char **argv); -extern char *dump_filename; -int dump(int dev_id, unsigned int opc, void *buf); - -#endif diff --git a/lnet/include/lnet/types.h b/lnet/include/lnet/types.h index 914bc4c..7939db9 100644 --- a/lnet/include/lnet/types.h +++ b/lnet/include/lnet/types.h @@ -1,10 +1,9 @@ -#ifndef _P30_TYPES_H_ -#define _P30_TYPES_H_ +#ifndef __LNET_TYPES_H__ +#define __LNET_TYPES_H__ #include "build_check.h" #include -#include /* This implementation uses the same type for API function return codes and * the completion status in an event */ diff --git a/lnet/klnds/gmlnd/gmlnd.h b/lnet/klnds/gmlnd/gmlnd.h index a4b007b..3411e59 100644 --- a/lnet/klnds/gmlnd/gmlnd.h +++ b/lnet/klnds/gmlnd/gmlnd.h @@ -63,8 +63,8 @@ #define DEBUG_SUBSYSTEM S_NAL #include "libcfs/kp30.h" -#include "lnet/p30.h" -#include "lnet/lib-p30.h" +#include "lnet/lnet.h" +#include "lnet/lib-lnet.h" /* undefine these before including the GM headers which clash */ #undef PACKAGE_BUGREPORT diff --git a/lnet/klnds/iiblnd/iiblnd.h b/lnet/klnds/iiblnd/iiblnd.h index 3ac5280..330b08e 100644 --- a/lnet/klnds/iiblnd/iiblnd.h +++ b/lnet/klnds/iiblnd/iiblnd.h @@ -51,8 +51,8 @@ #define DEBUG_SUBSYSTEM S_NAL #include -#include -#include +#include +#include #include diff --git a/lnet/klnds/openiblnd/openiblnd.h b/lnet/klnds/openiblnd/openiblnd.h index b350dc6..9bcdd3a 100644 --- a/lnet/klnds/openiblnd/openiblnd.h +++ b/lnet/klnds/openiblnd/openiblnd.h @@ -54,8 +54,8 @@ #define DEBUG_SUBSYSTEM S_NAL #include -#include -#include +#include +#include #include #include diff --git a/lnet/klnds/qswlnd/qswlnd.h b/lnet/klnds/qswlnd/qswlnd.h index 6e8aa42..bd22164 100644 --- a/lnet/klnds/qswlnd/qswlnd.h +++ b/lnet/klnds/qswlnd/qswlnd.h @@ -75,8 +75,8 @@ #define DEBUG_SUBSYSTEM S_NAL #include -#include -#include +#include +#include #define KQSW_CHECKSUM 0 #if KQSW_CHECKSUM diff --git a/lnet/klnds/ralnd/ralnd.h b/lnet/klnds/ralnd/ralnd.h index 7e52dd9..b6d0e29 100644 --- a/lnet/klnds/ralnd/ralnd.h +++ b/lnet/klnds/ralnd/ralnd.h @@ -54,8 +54,8 @@ #define DEBUG_SUBSYSTEM S_NAL #include -#include -#include +#include +#include #include diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h index bd7db07..63b9c06 100644 --- a/lnet/klnds/socklnd/socklnd.h +++ b/lnet/klnds/socklnd/socklnd.h @@ -39,8 +39,8 @@ #endif #include -#include -#include +#include +#include #include /* default vals for tunables/modparams */ diff --git a/lnet/klnds/viblnd/viblnd.h b/lnet/klnds/viblnd/viblnd.h index ec21241..9a07cc9 100644 --- a/lnet/klnds/viblnd/viblnd.h +++ b/lnet/klnds/viblnd/viblnd.h @@ -56,8 +56,8 @@ #define DEBUG_SUBSYSTEM S_NAL #include -#include -#include +#include +#include /* CPU_{L,B}E #defines needed by Voltaire headers */ #include diff --git a/lnet/libcfs/module.c b/lnet/libcfs/module.c index f3fda33..1cf1a5c 100644 --- a/lnet/libcfs/module.c +++ b/lnet/libcfs/module.c @@ -24,8 +24,8 @@ #endif #define DEBUG_SUBSYSTEM S_PORTALS -#include -#include +#include +#include #include void diff --git a/lnet/libcfs/nidstrings.c b/lnet/libcfs/nidstrings.c index 081b12a..191f66c 100644 --- a/lnet/libcfs/nidstrings.c +++ b/lnet/libcfs/nidstrings.c @@ -26,7 +26,7 @@ #define DEBUG_SUBSYSTEM S_PORTALS -#include +#include #include #ifndef __KERNEL__ #include diff --git a/lnet/lnet/acceptor.c b/lnet/lnet/acceptor.c index 2940c5a..7d798c0 100644 --- a/lnet/lnet/acceptor.c +++ b/lnet/lnet/acceptor.c @@ -21,7 +21,7 @@ */ #define DEBUG_SUBSYSTEM S_PORTALS -#include +#include #ifdef __KERNEL__ static char *accept = "secure"; diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c index ab698ac..6a488ac 100644 --- a/lnet/lnet/api-ni.c +++ b/lnet/lnet/api-ni.c @@ -20,7 +20,7 @@ */ #define DEBUG_SUBSYSTEM S_PORTALS -#include +#include #define DEFAULT_NETWORKS "tcp" static char *networks = DEFAULT_NETWORKS; diff --git a/lnet/lnet/config.c b/lnet/lnet/config.c index 1bff498..c01c417 100644 --- a/lnet/lnet/config.c +++ b/lnet/lnet/config.c @@ -20,7 +20,7 @@ */ #define DEBUG_SUBSYSTEM S_PORTALS -#include +#include typedef struct { /* tmp struct for parsing routes */ struct list_head ptb_list; /* stash on lists */ diff --git a/lnet/lnet/lib-eq.c b/lnet/lnet/lib-eq.c index af0c1aa..fdfc16e 100644 --- a/lnet/lnet/lib-eq.c +++ b/lnet/lnet/lib-eq.c @@ -23,7 +23,7 @@ */ #define DEBUG_SUBSYSTEM S_PORTALS -#include +#include int LNetEQAlloc(lnet_handle_ni_t interface, lnet_size_t count, diff --git a/lnet/lnet/lib-md.c b/lnet/lnet/lib-md.c index 8564002..e8c6a3b 100644 --- a/lnet/lnet/lib-md.c +++ b/lnet/lnet/lib-md.c @@ -24,7 +24,7 @@ #define DEBUG_SUBSYSTEM S_PORTALS -#include +#include /* must be called with PTL_LOCK held */ void diff --git a/lnet/lnet/lib-me.c b/lnet/lnet/lib-me.c index e0aef8e..a445919 100644 --- a/lnet/lnet/lib-me.c +++ b/lnet/lnet/lib-me.c @@ -24,7 +24,7 @@ #define DEBUG_SUBSYSTEM S_PORTALS -#include +#include int LNetMEAttach(lnet_handle_ni_t interface, diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c index 91c1d31..a8685b9 100644 --- a/lnet/lnet/lib-move.c +++ b/lnet/lnet/lib-move.c @@ -24,7 +24,7 @@ #define DEBUG_SUBSYSTEM S_PORTALS -#include +#include #if 1 /* Enforce the rule that the target NID must be that of the receiving NI */ diff --git a/lnet/lnet/lib-msg.c b/lnet/lnet/lib-msg.c index 1a4da6f..4d58820 100644 --- a/lnet/lnet/lib-msg.c +++ b/lnet/lnet/lib-msg.c @@ -24,7 +24,7 @@ #define DEBUG_SUBSYSTEM S_PORTALS -#include +#include void ptl_enq_event_locked (void *private, ptl_eq_t *eq, lnet_event_t *ev) diff --git a/lnet/lnet/lo.c b/lnet/lnet/lo.c index 3dbb5fc..6e3f408 100644 --- a/lnet/lnet/lo.c +++ b/lnet/lnet/lo.c @@ -19,7 +19,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include int lonal_send (ptl_ni_t *ni, diff --git a/lnet/lnet/module.c b/lnet/lnet/module.c index d94e555..28c464a 100644 --- a/lnet/lnet/module.c +++ b/lnet/lnet/module.c @@ -23,7 +23,7 @@ # define EXPORT_SYMTAB #endif #define DEBUG_SUBSYSTEM S_PORTALS -#include +#include static int config_on_load = 0; CFS_MODULE_PARM(config_on_load, "i", int, 0444, diff --git a/lnet/lnet/router.h b/lnet/lnet/router.h index afe377f..cb7f29d 100644 --- a/lnet/lnet/router.h +++ b/lnet/lnet/router.h @@ -26,7 +26,7 @@ #define DEBUG_SUBSYSTEM S_PTLROUTER -#include +#include #ifdef __KERNEL__ diff --git a/lnet/tests/ping.h b/lnet/tests/ping.h index 3ffadf5..f68c4fc 100644 --- a/lnet/tests/ping.h +++ b/lnet/tests/ping.h @@ -2,7 +2,7 @@ #define _KPING_INCLUDED #include -#include +#include #define PTL_PING_IN_SIZE 256 // n packets per buffer diff --git a/lnet/tests/ping_cli.c b/lnet/tests/ping_cli.c index 4a803e5..acd3618 100644 --- a/lnet/tests/ping_cli.c +++ b/lnet/tests/ping_cli.c @@ -26,7 +26,7 @@ #define DEBUG_SUBSYSTEM S_PINGER #include -#include +#include #include "ping.h" /* int portal_debug = D_PING_CLI; */ diff --git a/lnet/tests/ping_srv.c b/lnet/tests/ping_srv.c index 5adfb26..ca5c19d 100644 --- a/lnet/tests/ping_srv.c +++ b/lnet/tests/ping_srv.c @@ -26,7 +26,7 @@ #define DEBUG_SUBSYSTEM S_PINGER #include -#include +#include #include "ping.h" #define STDSIZE (sizeof(int) + sizeof(int) + sizeof(struct timeval)) diff --git a/lnet/tests/sping_cli.c b/lnet/tests/sping_cli.c index a27cd5f..581e7dd 100644 --- a/lnet/tests/sping_cli.c +++ b/lnet/tests/sping_cli.c @@ -32,7 +32,7 @@ #define DEBUG_SUBSYSTEM S_PINGER #include -#include +#include #include #include #include diff --git a/lnet/tests/sping_srv.c b/lnet/tests/sping_srv.c index 072a98c..15b5769 100644 --- a/lnet/tests/sping_srv.c +++ b/lnet/tests/sping_srv.c @@ -31,7 +31,7 @@ #define DEBUG_SUBSYSTEM S_PINGER #include -#include +#include #include "ping.h" #include diff --git a/lnet/ulnds/bridge.h b/lnet/ulnds/bridge.h index 9e72903..78aabd0 100644 --- a/lnet/ulnds/bridge.h +++ b/lnet/ulnds/bridge.h @@ -9,7 +9,7 @@ #ifndef TCPNAL_PROCBRIDGE_H #define TCPNAL_PROCBRIDGE_H -#include +#include typedef struct bridge { int alive; diff --git a/lnet/ulnds/socklnd/bridge.h b/lnet/ulnds/socklnd/bridge.h index 9e72903..78aabd0 100644 --- a/lnet/ulnds/socklnd/bridge.h +++ b/lnet/ulnds/socklnd/bridge.h @@ -9,7 +9,7 @@ #ifndef TCPNAL_PROCBRIDGE_H #define TCPNAL_PROCBRIDGE_H -#include +#include typedef struct bridge { int alive; diff --git a/lnet/utils/debug.c b/lnet/utils/debug.c index 294f149..32d5267 100644 --- a/lnet/utils/debug.c +++ b/lnet/utils/debug.c @@ -50,7 +50,7 @@ #include #include -#include +#include #include #include "parser.h" diff --git a/lnet/utils/debugctl.c b/lnet/utils/debugctl.c index 9f5df8c..39e0a264 100644 --- a/lnet/utils/debugctl.c +++ b/lnet/utils/debugctl.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "parser.h" diff --git a/lnet/utils/l_ioctl.c b/lnet/utils/l_ioctl.c index 7884ec0..27305b0 100644 --- a/lnet/utils/l_ioctl.c +++ b/lnet/utils/l_ioctl.c @@ -34,7 +34,7 @@ #include #include -#include +#include #include static ioc_handler_t do_ioctl; /* forward ref */ diff --git a/lnet/utils/portals.c b/lnet/utils/portals.c index de45bd8..f469177 100644 --- a/lnet/utils/portals.c +++ b/lnet/utils/portals.c @@ -54,7 +54,7 @@ #include #include -#include +#include #include #include "parser.h" diff --git a/lnet/utils/ptlctl.c b/lnet/utils/ptlctl.c index cc88eae..2dc3859 100644 --- a/lnet/utils/ptlctl.c +++ b/lnet/utils/ptlctl.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "parser.h" diff --git a/lnet/utils/wirecheck.c b/lnet/utils/wirecheck.c index 4909dd9..43f4927 100644 --- a/lnet/utils/wirecheck.c +++ b/lnet/utils/wirecheck.c @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include -- 1.8.3.1