From b7fdc8d797b142c779a14aa90f845e6ac2e9165d Mon Sep 17 00:00:00 2001 From: David Rose Date: Sat, 5 Dec 2009 19:37:17 +0000 Subject: [PATCH] tag a few more methods BLOCKING --- panda/src/net/connectionManager.h | 18 +++++++++--------- panda/src/net/connectionWriter.h | 16 ++++++++-------- panda/src/net/queuedConnectionListener.h | 2 +- panda/src/net/queuedConnectionReader.h | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/panda/src/net/connectionManager.h b/panda/src/net/connectionManager.h index 1f1c639a44..95930aa3a7 100644 --- a/panda/src/net/connectionManager.h +++ b/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); diff --git a/panda/src/net/connectionWriter.h b/panda/src/net/connectionWriter.h index 7ec486d45d..f8b13fbb32 100644 --- a/panda/src/net/connectionWriter.h +++ b/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; diff --git a/panda/src/net/queuedConnectionListener.h b/panda/src/net/queuedConnectionListener.h index 24d1c2adc6..8543945910 100644 --- a/panda/src/net/queuedConnectionListener.h +++ b/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); diff --git a/panda/src/net/queuedConnectionReader.h b/panda/src/net/queuedConnectionReader.h index 7f5340342a..644c32dd3d 100644 --- a/panda/src/net/queuedConnectionReader.h +++ b/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);