Browse Source

tag a few more methods BLOCKING

David Rose 16 years ago
parent
commit
b7fdc8d797

+ 9 - 9
panda/src/net/connectionManager.h

@@ -50,15 +50,15 @@ PUBLISHED:
 
   PT(Connection) open_UDP_connection(int port = 0);
 
-  PT(Connection) open_TCP_server_rendezvous(int port, int backlog);
-  PT(Connection) open_TCP_server_rendezvous(const string &hostname, 
-                                            int port, int backlog);
-  PT(Connection) open_TCP_server_rendezvous(const NetAddress &address, 
-                                            int backlog);
-  PT(Connection) open_TCP_client_connection(const NetAddress &address,
-                                            int timeout_ms);
-  PT(Connection) open_TCP_client_connection(const string &hostname, int port,
-                                            int timeout_ms);
+  BLOCKING PT(Connection) open_TCP_server_rendezvous(int port, int backlog);
+  BLOCKING PT(Connection) open_TCP_server_rendezvous(const string &hostname, 
+                                                     int port, int backlog);
+  BLOCKING PT(Connection) open_TCP_server_rendezvous(const NetAddress &address, 
+                                                     int backlog);
+  BLOCKING PT(Connection) open_TCP_client_connection(const NetAddress &address,
+                                                     int timeout_ms);
+  BLOCKING PT(Connection) open_TCP_client_connection(const string &hostname, int port,
+                                                     int timeout_ms);
 
   bool close_connection(const PT(Connection) &connection);
 

+ 8 - 8
panda/src/net/connectionWriter.h

@@ -44,14 +44,14 @@ PUBLISHED:
   int get_max_queue_size() const;
   int get_current_queue_size() const;
 
-  bool send(const Datagram &datagram,
-            const PT(Connection) &connection,
-            bool block = false);
-
-  bool send(const Datagram &datagram,
-            const PT(Connection) &connection,
-            const NetAddress &address,
-            bool block = false);
+  BLOCKING bool send(const Datagram &datagram,
+                     const PT(Connection) &connection,
+                     bool block = false);
+  
+  BLOCKING bool send(const Datagram &datagram,
+                     const PT(Connection) &connection,
+                     const NetAddress &address,
+                     bool block = false);
 
   bool is_valid_for_udp(const Datagram &datagram) const;
 

+ 1 - 1
panda/src/net/queuedConnectionListener.h

@@ -51,7 +51,7 @@ PUBLISHED:
   QueuedConnectionListener(ConnectionManager *manager, int num_threads);
   virtual ~QueuedConnectionListener();
 
-  bool new_connection_available();
+  BLOCKING bool new_connection_available();
   bool get_new_connection(PT(Connection) &rendezvous,
                           NetAddress &address,
                           PT(Connection) &new_connection);

+ 1 - 1
panda/src/net/queuedConnectionReader.h

@@ -40,7 +40,7 @@ PUBLISHED:
   QueuedConnectionReader(ConnectionManager *manager, int num_threads);
   virtual ~QueuedConnectionReader();
 
-  bool data_available();
+  BLOCKING bool data_available();
   bool get_data(NetDatagram &result);
   bool get_data(Datagram &result);