Land b1_2 onto HEAD (20040304_171022)

[fs/lustre-release.git] / lnet / ulnds / connection.h

diff --git a/lnet/ulnds/connection.h b/lnet/ulnds/connection.h
index 6f57287..343ffa6 100644 (file)
--- a/lnet/ulnds/connection.h
+++ b/lnet/ulnds/connection.h
@@ -7,9 +7,11 @@
  */
 
 #include <table.h>
  */
 
 #include <table.h>

+#include <procbridge.h>

 
 typedef struct manager {
     table connections;
 
 typedef struct manager {
     table connections;

+    pthread_mutex_t conn_lock; /* protect connections table */

     int bound;
     io_handler bound_handler;
     int (*handler)(void *, void *);
     int bound;
     io_handler bound_handler;
     int (*handler)(void *, void *);


@@ -25,7 +27,8 @@ typedef struct connection {
     manager m;
 } *connection;
 
     manager m;
 } *connection;
 

-connection force_tcp_connection(manager m, unsigned int ip, unsigned int short);
+connection force_tcp_connection(manager m, unsigned int ip, unsigned int short,
+                                procbridge pb);

 manager init_connections(unsigned short, int (*f)(void *, void *), void *);
 void remove_connection(void *arg);
 void shutdown_connections(manager m);
 manager init_connections(unsigned short, int (*f)(void *, void *), void *);
 void remove_connection(void *arg);
 void shutdown_connections(manager m);