summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/ctx.cpp9
-rw-r--r--src/ctx.hpp6
-rw-r--r--src/options.cpp5
-rw-r--r--src/options.hpp5
-rw-r--r--src/pair.cpp6
-rw-r--r--src/pair.hpp4
-rw-r--r--src/pub.cpp6
-rw-r--r--src/pub.hpp4
-rw-r--r--src/pull.cpp6
-rw-r--r--src/pull.hpp4
-rw-r--r--src/push.cpp6
-rw-r--r--src/push.hpp4
-rw-r--r--src/rep.cpp6
-rw-r--r--src/rep.hpp4
-rw-r--r--src/req.cpp6
-rw-r--r--src/req.hpp4
-rw-r--r--src/socket_base.cpp29
-rw-r--r--src/socket_base.hpp6
-rw-r--r--src/sub.cpp6
-rw-r--r--src/sub.hpp4
-rw-r--r--src/xpub.cpp6
-rw-r--r--src/xpub.hpp4
-rw-r--r--src/xrep.cpp6
-rw-r--r--src/xrep.hpp4
-rw-r--r--src/xreq.cpp6
-rw-r--r--src/xreq.hpp4
-rw-r--r--src/xsub.cpp6
-rw-r--r--src/xsub.hpp4
28 files changed, 92 insertions, 78 deletions
diff --git a/src/ctx.cpp b/src/ctx.cpp
index d8783be..54e665a 100644
--- a/src/ctx.cpp
+++ b/src/ctx.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2007-2011 iMatix Corporation
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -180,8 +180,11 @@ zmq::socket_base_t *zmq::ctx_t::create_socket (int type_)
uint32_t slot = empty_slots.back ();
empty_slots.pop_back ();
+ // Generate new unique socket ID.
+ int sid = ((int) max_socket_id.add (1)) + 1;
+
// Create the socket and register its mailbox.
- socket_base_t *s = socket_base_t::create (type_, this, slot);
+ socket_base_t *s = socket_base_t::create (type_, this, slot, sid);
if (!s) {
empty_slots.push_back (slot);
slot_sync.unlock ();
@@ -322,4 +325,6 @@ void zmq::ctx_t::log (const char *format_, va_list args_)
errno_assert (rc == 0);
}
+// The last used socket ID, or 0 if no socket was used so far.
+zmq::atomic_counter_t zmq::ctx_t::max_socket_id;
diff --git a/src/ctx.hpp b/src/ctx.hpp
index e09149d..bcffcd7 100644
--- a/src/ctx.hpp
+++ b/src/ctx.hpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2007-2009 iMatix Corporation
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -33,6 +33,7 @@
#include "mutex.hpp"
#include "stdint.hpp"
#include "options.hpp"
+#include "atomic_counter.hpp"
namespace zmq
{
@@ -151,6 +152,9 @@ namespace zmq
zmq::socket_base_t *log_socket;
mutex_t log_sync;
+ // Maximum socket ID.
+ static atomic_counter_t max_socket_id;
+
ctx_t (const ctx_t&);
const ctx_t &operator = (const ctx_t&);
};
diff --git a/src/options.cpp b/src/options.cpp
index 4db1a6c..61daf87 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2007-2009 iMatix Corporation
Copyright (c) 2011 VMware, Inc.
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -48,7 +48,8 @@ zmq::options_t::options_t () :
delay_on_disconnect (true),
filter (false),
send_identity (false),
- recv_identity (false)
+ recv_identity (false),
+ socket_id (0)
{
}
diff --git a/src/options.hpp b/src/options.hpp
index bfc9dc7..9a93af4 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2007-2009 iMatix Corporation
Copyright (c) 2011 VMware, Inc.
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -105,6 +105,9 @@ namespace zmq
// Receivers identity from all new connections.
bool recv_identity;
+
+ // ID of the socket.
+ int socket_id;
};
}
diff --git a/src/pair.cpp b/src/pair.cpp
index 6c652db..1bc9db3 100644
--- a/src/pair.cpp
+++ b/src/pair.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2007-2009 iMatix Corporation
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -24,8 +24,8 @@
#include "pipe.hpp"
#include "msg.hpp"
-zmq::pair_t::pair_t (class ctx_t *parent_, uint32_t tid_) :
- socket_base_t (parent_, tid_),
+zmq::pair_t::pair_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
+ socket_base_t (parent_, tid_, sid_),
pipe (NULL)
{
options.type = ZMQ_PAIR;
diff --git a/src/pair.hpp b/src/pair.hpp
index fb447f1..9514b1b 100644
--- a/src/pair.hpp
+++ b/src/pair.hpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2007-2009 iMatix Corporation
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -38,7 +38,7 @@ namespace zmq
{
public:
- pair_t (zmq::ctx_t *parent_, uint32_t tid_);
+ pair_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
~pair_t ();
// Overloads of functions from socket_base_t.
diff --git a/src/pub.cpp b/src/pub.cpp
index 7458d5f..d29a3f9 100644
--- a/src/pub.cpp
+++ b/src/pub.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2007-2009 iMatix Corporation
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -22,8 +22,8 @@
#include "pub.hpp"
#include "msg.hpp"
-zmq::pub_t::pub_t (class ctx_t *parent_, uint32_t tid_) :
- xpub_t (parent_, tid_)
+zmq::pub_t::pub_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
+ xpub_t (parent_, tid_, sid_)
{
options.type = ZMQ_PUB;
}
diff --git a/src/pub.hpp b/src/pub.hpp
index 4672600..fc12cad 100644
--- a/src/pub.hpp
+++ b/src/pub.hpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2007-2009 iMatix Corporation
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -36,7 +36,7 @@ namespace zmq
{
public:
- pub_t (zmq::ctx_t *parent_, uint32_t tid_);
+ pub_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
~pub_t ();
// Implementations of virtual functions from socket_base_t.
diff --git a/src/pull.cpp b/src/pull.cpp
index 6028118..6ff5915 100644
--- a/src/pull.cpp
+++ b/src/pull.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2007-2010 iMatix Corporation
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -24,8 +24,8 @@
#include "msg.hpp"
#include "pipe.hpp"
-zmq::pull_t::pull_t (class ctx_t *parent_, uint32_t tid_) :
- socket_base_t (parent_, tid_)
+zmq::pull_t::pull_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
+ socket_base_t (parent_, tid_, sid_)
{
options.type = ZMQ_PULL;
}
diff --git a/src/pull.hpp b/src/pull.hpp
index da3bee1..6ab7579 100644
--- a/src/pull.hpp
+++ b/src/pull.hpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2007-2010 iMatix Corporation
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -39,7 +39,7 @@ namespace zmq
{
public:
- pull_t (zmq::ctx_t *parent_, uint32_t tid_);
+ pull_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
~pull_t ();
protected:
diff --git a/src/push.cpp b/src/push.cpp
index a0ed992..2136e2b 100644
--- a/src/push.cpp
+++ b/src/push.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2007-2010 iMatix Corporation
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -24,8 +24,8 @@
#include "err.hpp"
#include "msg.hpp"
-zmq::push_t::push_t (class ctx_t *parent_, uint32_t tid_) :
- socket_base_t (parent_, tid_)
+zmq::push_t::push_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
+ socket_base_t (parent_, tid_, sid_)
{
options.type = ZMQ_PUSH;
}
diff --git a/src/push.hpp b/src/push.hpp
index edee19d..07900eb 100644
--- a/src/push.hpp
+++ b/src/push.hpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2007-2010 iMatix Corporation
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -39,7 +39,7 @@ namespace zmq
{
public:
- push_t (zmq::ctx_t *parent_, uint32_t tid_);
+ push_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
~push_t ();
protected:
diff --git a/src/rep.cpp b/src/rep.cpp
index 02a825c..5ded266 100644
--- a/src/rep.cpp
+++ b/src/rep.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2007-2011 iMatix Corporation
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -23,8 +23,8 @@
#include "err.hpp"
#include "msg.hpp"
-zmq::rep_t::rep_t (class ctx_t *parent_, uint32_t tid_) :
- xrep_t (parent_, tid_),
+zmq::rep_t::rep_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
+ xrep_t (parent_, tid_, sid_),
sending_reply (false),
request_begins (true)
{
diff --git a/src/rep.hpp b/src/rep.hpp
index 04b3d86..87d9e2a 100644
--- a/src/rep.hpp
+++ b/src/rep.hpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2007-2011 iMatix Corporation
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -36,7 +36,7 @@ namespace zmq
{
public:
- rep_t (zmq::ctx_t *parent_, uint32_t tid_);
+ rep_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
~rep_t ();
// Overloads of functions from socket_base_t.
diff --git a/src/req.cpp b/src/req.cpp
index cf7dd45..1f09e8e 100644
--- a/src/req.cpp
+++ b/src/req.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2007-2009 iMatix Corporation
Copyright (c) 2011 VMware, Inc.
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -27,8 +27,8 @@
#include "random.hpp"
#include "likely.hpp"
-zmq::req_t::req_t (class ctx_t *parent_, uint32_t tid_) :
- xreq_t (parent_, tid_),
+zmq::req_t::req_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
+ xreq_t (parent_, tid_, sid_),
receiving_reply (false),
message_begins (true)
{
diff --git a/src/req.hpp b/src/req.hpp
index e743cb8..69b7bd4 100644
--- a/src/req.hpp
+++ b/src/req.hpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2007-2009 iMatix Corporation
Copyright (c) 2011 VMware, Inc.
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -38,7 +38,7 @@ namespace zmq
{
public:
- req_t (zmq::ctx_t *parent_, uint32_t tid_);
+ req_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
~req_t ();
// Overloads of functions from socket_base_t.
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index 7293419..077d6e0 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2007-2009 iMatix Corporation
Copyright (c) 2011 VMware, Inc.
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -68,43 +68,43 @@ bool zmq::socket_base_t::check_tag ()
}
zmq::socket_base_t *zmq::socket_base_t::create (int type_, class ctx_t *parent_,
- uint32_t tid_)
+ uint32_t tid_, int sid_)
{
socket_base_t *s = NULL;
switch (type_) {
case ZMQ_PAIR:
- s = new (std::nothrow) pair_t (parent_, tid_);
+ s = new (std::nothrow) pair_t (parent_, tid_, sid_);
break;
case ZMQ_PUB:
- s = new (std::nothrow) pub_t (parent_, tid_);
+ s = new (std::nothrow) pub_t (parent_, tid_, sid_);
break;
case ZMQ_SUB:
- s = new (std::nothrow) sub_t (parent_, tid_);
+ s = new (std::nothrow) sub_t (parent_, tid_, sid_);
break;
case ZMQ_REQ:
- s = new (std::nothrow) req_t (parent_, tid_);
+ s = new (std::nothrow) req_t (parent_, tid_, sid_);
break;
case ZMQ_REP:
- s = new (std::nothrow) rep_t (parent_, tid_);
+ s = new (std::nothrow) rep_t (parent_, tid_, sid_);
break;
case ZMQ_XREQ:
- s = new (std::nothrow) xreq_t (parent_, tid_);
+ s = new (std::nothrow) xreq_t (parent_, tid_, sid_);
break;
case ZMQ_XREP:
- s = new (std::nothrow) xrep_t (parent_, tid_);
+ s = new (std::nothrow) xrep_t (parent_, tid_, sid_);
break;
case ZMQ_PULL:
- s = new (std::nothrow) pull_t (parent_, tid_);
+ s = new (std::nothrow) pull_t (parent_, tid_, sid_);
break;
case ZMQ_PUSH:
- s = new (std::nothrow) push_t (parent_, tid_);
+ s = new (std::nothrow) push_t (parent_, tid_, sid_);
break;
case ZMQ_XPUB:
- s = new (std::nothrow) xpub_t (parent_, tid_);
+ s = new (std::nothrow) xpub_t (parent_, tid_, sid_);
break;
case ZMQ_XSUB:
- s = new (std::nothrow) xsub_t (parent_, tid_);
+ s = new (std::nothrow) xsub_t (parent_, tid_, sid_);
break;
default:
errno = EINVAL;
@@ -114,7 +114,7 @@ zmq::socket_base_t *zmq::socket_base_t::create (int type_, class ctx_t *parent_,
return s;
}
-zmq::socket_base_t::socket_base_t (ctx_t *parent_, uint32_t tid_) :
+zmq::socket_base_t::socket_base_t (ctx_t *parent_, uint32_t tid_, int sid_) :
own_t (parent_, tid_),
tag (0xbaddecaf),
ctx_terminated (false),
@@ -123,6 +123,7 @@ zmq::socket_base_t::socket_base_t (ctx_t *parent_, uint32_t tid_) :
ticks (0),
rcvmore (false)
{
+ options.socket_id = sid_;
}
zmq::socket_base_t::~socket_base_t ()
diff --git a/src/socket_base.hpp b/src/socket_base.hpp
index dda87f4..144eb8d 100644
--- a/src/socket_base.hpp
+++ b/src/socket_base.hpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2007-2009 iMatix Corporation
Copyright (c) 2011 VMware, Inc.
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -57,7 +57,7 @@ namespace zmq
// Create a socket of a specified type.
static socket_base_t *create (int type_, zmq::ctx_t *parent_,
- uint32_t tid_);
+ uint32_t tid_, int sid_);
// Returns the mailbox associated with this socket.
mailbox_t *get_mailbox ();
@@ -98,7 +98,7 @@ namespace zmq
protected:
- socket_base_t (zmq::ctx_t *parent_, uint32_t tid_);
+ socket_base_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
virtual ~socket_base_t ();
// Concrete algorithms for the x- methods are to be defined by
diff --git a/src/sub.cpp b/src/sub.cpp
index 3249aea..ddd1321 100644
--- a/src/sub.cpp
+++ b/src/sub.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2007-2009 iMatix Corporation
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -22,8 +22,8 @@
#include "sub.hpp"
#include "msg.hpp"
-zmq::sub_t::sub_t (class ctx_t *parent_, uint32_t tid_) :
- xsub_t (parent_, tid_)
+zmq::sub_t::sub_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
+ xsub_t (parent_, tid_, sid_)
{
options.type = ZMQ_SUB;
diff --git a/src/sub.hpp b/src/sub.hpp
index 1c69b06..272922f 100644
--- a/src/sub.hpp
+++ b/src/sub.hpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2007-2009 iMatix Corporation
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -36,7 +36,7 @@ namespace zmq
{
public:
- sub_t (zmq::ctx_t *parent_, uint32_t tid_);
+ sub_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
~sub_t ();
protected:
diff --git a/src/xpub.cpp b/src/xpub.cpp
index 5d7a97c..af83af1 100644
--- a/src/xpub.cpp
+++ b/src/xpub.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2010-2011 250bpm s.r.o.
+ Copyright (c) 2010-2012 250bpm s.r.o.
Copyright (c) 2011 VMware, Inc.
Copyright (c) 2010-2011 Other contributors as noted in the AUTHORS file
@@ -26,8 +26,8 @@
#include "err.hpp"
#include "msg.hpp"
-zmq::xpub_t::xpub_t (class ctx_t *parent_, uint32_t tid_) :
- socket_base_t (parent_, tid_),
+zmq::xpub_t::xpub_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
+ socket_base_t (parent_, tid_, sid_),
more (false)
{
options.type = ZMQ_XPUB;
diff --git a/src/xpub.hpp b/src/xpub.hpp
index 3f80d4a..054d476 100644
--- a/src/xpub.hpp
+++ b/src/xpub.hpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2010-2011 250bpm s.r.o.
+ Copyright (c) 2010-2012 250bpm s.r.o.
Copyright (c) 2010-2011 Other contributors as noted in the AUTHORS file
This file is part of 0MQ.
@@ -43,7 +43,7 @@ namespace zmq
{
public:
- xpub_t (zmq::ctx_t *parent_, uint32_t tid_);
+ xpub_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
~xpub_t ();
// Implementations of virtual functions from socket_base_t.
diff --git a/src/xrep.cpp b/src/xrep.cpp
index 520fa24..2fc367a 100644
--- a/src/xrep.cpp
+++ b/src/xrep.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2011 iMatix Corporation
Copyright (c) 2011 VMware, Inc.
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -27,8 +27,8 @@
#include "likely.hpp"
#include "err.hpp"
-zmq::xrep_t::xrep_t (class ctx_t *parent_, uint32_t tid_) :
- socket_base_t (parent_, tid_),
+zmq::xrep_t::xrep_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
+ socket_base_t (parent_, tid_, sid_),
prefetched (0),
more_in (false),
current_out (NULL),
diff --git a/src/xrep.hpp b/src/xrep.hpp
index 65bd564..a6dd2d3 100644
--- a/src/xrep.hpp
+++ b/src/xrep.hpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2011 iMatix Corporation
Copyright (c) 2011 VMware, Inc.
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -44,7 +44,7 @@ namespace zmq
{
public:
- xrep_t (zmq::ctx_t *parent_, uint32_t tid_);
+ xrep_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
~xrep_t ();
// Overloads of functions from socket_base_t.
diff --git a/src/xreq.cpp b/src/xreq.cpp
index bf288ee..731fb1f 100644
--- a/src/xreq.cpp
+++ b/src/xreq.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2011 VMware, Inc.
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -23,8 +23,8 @@
#include "err.hpp"
#include "msg.hpp"
-zmq::xreq_t::xreq_t (class ctx_t *parent_, uint32_t tid_) :
- socket_base_t (parent_, tid_),
+zmq::xreq_t::xreq_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
+ socket_base_t (parent_, tid_, sid_),
prefetched (false)
{
options.type = ZMQ_XREQ;
diff --git a/src/xreq.hpp b/src/xreq.hpp
index 897c197..4542950 100644
--- a/src/xreq.hpp
+++ b/src/xreq.hpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009-2011 250bpm s.r.o.
+ Copyright (c) 2009-2012 250bpm s.r.o.
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
This file is part of 0MQ.
@@ -40,7 +40,7 @@ namespace zmq
{
public:
- xreq_t (zmq::ctx_t *parent_, uint32_t tid_);
+ xreq_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
~xreq_t ();
protected:
diff --git a/src/xsub.cpp b/src/xsub.cpp
index 454dfb0..e227c75 100644
--- a/src/xsub.cpp
+++ b/src/xsub.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2010-2011 250bpm s.r.o.
+ Copyright (c) 2010-2012 250bpm s.r.o.
Copyright (c) 2011 VMware, Inc.
Copyright (c) 2010-2011 Other contributors as noted in the AUTHORS file
@@ -24,8 +24,8 @@
#include "xsub.hpp"
#include "err.hpp"
-zmq::xsub_t::xsub_t (class ctx_t *parent_, uint32_t tid_) :
- socket_base_t (parent_, tid_),
+zmq::xsub_t::xsub_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
+ socket_base_t (parent_, tid_, sid_),
has_message (false),
more (false)
{
diff --git a/src/xsub.hpp b/src/xsub.hpp
index 24f8157..97b2df2 100644
--- a/src/xsub.hpp
+++ b/src/xsub.hpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2010-2011 250bpm s.r.o.
+ Copyright (c) 2010-2012 250bpm s.r.o.
Copyright (c) 2010-2011 Other contributors as noted in the AUTHORS file
This file is part of 0MQ.
@@ -39,7 +39,7 @@ namespace zmq
{
public:
- xsub_t (zmq::ctx_t *parent_, uint32_t tid_);
+ xsub_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
~xsub_t ();
protected:
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 16:05:39 +0000