generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-10 08:08:33 +01:00
Code Issues Projects Releases Wiki Activity

Minor cleanups

Browse Source 
* corrects whitespace errors
* fixes spelling errors in comments
* prefers #ifdef to #if defined
This commit is contained in:
Martin Hurton
2012-03-22 07:06:17 +01:00
parent ae2b938330
commit 151d0717bb
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ctx.cpp
View File

@@ -20,7 +20,7 @@
*/
#include "platform.hpp"
#if defined ZMQ_HAVE_WINDOWS
#ifdef ZMQ_HAVE_WINDOWS
#include "windows.hpp"
#else
#include <unistd.h>
@@ -245,10 +245,10 @@ void zmq::ctx_t::destroy_socket (class socket_base_t *socket_)
{
slot_sync.lock ();
// Free the associared thread slot.
// Free the associated thread slot.
uint32_t tid = socket_->get_tid ();
empty_slots.push_back (tid);
slots [tid] = NULL;
slots [tid] = NULL;
// Remove the socket from the list of sockets.
sockets.erase (socket_);
@@ -322,7 +322,7 @@ void zmq::ctx_t::unregister_endpoints (socket_base_t *socket_)
}
++it;
}
endpoints_sync.unlock ();
}

20
src/ctx.hpp
View File

@@ -48,18 +48,18 @@ namespace zmq
// for synchronisation, handshaking or similar.
struct endpoint_t
{
class socket_base_t *socket;
socket_base_t *socket;
options_t options;
};
// Context object encapsulates all the global state associated with
// the library.
class ctx_t
{
public:
// Create the context object
// Create the context object.
ctx_t ();
// Returns false if object is not a context.
@@ -71,10 +71,10 @@ namespace zmq
// after the last one is closed.
int terminate ();
// Set and set context properties
// Set and get context properties.
int set (int option_, int optval_);
int get (int option_);
// Create and destroy a socket.
zmq::socket_base_t *create_socket (int type_);
void destroy_socket (zmq::socket_base_t *socket_);
@@ -84,7 +84,7 @@ namespace zmq
// Returns the I/O thread that is the least busy at the moment.
// Affinity specifies which I/O threads are eligible (0 = all).
// Returns NULL is no I/O thread is available.
// Returns NULL if no I/O thread is available.
zmq::io_thread_t *choose_io_thread (uint64_t affinity_);
// Returns reaper thread object.
@@ -117,8 +117,8 @@ namespace zmq
typedef std::vector <uint32_t> emtpy_slots_t;
emtpy_slots_t empty_slots;
// If true, zmq_init has been called but no socket have been created
// yes. Launching of I/O threads is delayed.
// If true, zmq_init has been called but no socket has been created
// yet. Launching of I/O threads is delayed.
bool starting;
// If true, zmq_term was already called.
@@ -162,11 +162,11 @@ namespace zmq
// Synchronisation of access to context options.
mutex_t opt_sync;
ctx_t (const ctx_t&);
const ctx_t &operator = (const ctx_t&);
};
}
#endif