3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-17 08:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #578 from gonzus/master

Browse Source 
Changes to sanity tag in ctx
This commit is contained in:
Pieter Hintjens 2013-06-20 09:47:22 -07:00
commit c5a9fa5b5e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -67,6 +67,7 @@ bin/
lib/ lib/
obj/ obj/
builds/msvc/*.suo builds/msvc/*.suo
builds/msvc/*.sdf
builds/msvc/*/*.user builds/msvc/*/*.user
builds/msvc/*/*Debug builds/msvc/*/*Debug
builds/msvc/*/*Release builds/msvc/*/*Release
@ -78,4 +79,3 @@ foreign/openpgm/*
zeromq-*.tar.gz zeromq-*.tar.gz
zeromq-*.zip zeromq-*.zip
core core

9
src/ctx.cpp
View File

@ -35,8 +35,11 @@
#include "err.hpp" #include "err.hpp"
#include "msg.hpp" #include "msg.hpp"
#define ZMQ_CTX_TAG_VALUE_GOOD 0xabadcafe
#define ZMQ_CTX_TAG_VALUE_BAD 0xdeadbeef
zmq::ctx_t::ctx_t () : zmq::ctx_t::ctx_t () :
tag (0xabadcafe), tag (ZMQ_CTX_TAG_VALUE_GOOD),
starting (true), starting (true),
terminating (false), terminating (false),
reaper (NULL), reaper (NULL),
@ -50,7 +53,7 @@ zmq::ctx_t::ctx_t () :
bool zmq::ctx_t::check_tag () bool zmq::ctx_t::check_tag ()
{ {
return tag == 0xabadcafe; return tag == ZMQ_CTX_TAG_VALUE_GOOD;
} }
zmq::ctx_t::~ctx_t () zmq::ctx_t::~ctx_t ()
@ -78,7 +81,7 @@ zmq::ctx_t::~ctx_t ()
free (slots); free (slots);
// Remove the tag, so that the object is considered dead. // Remove the tag, so that the object is considered dead.
tag = 0xdeadbeef; tag = ZMQ_CTX_TAG_VALUE_BAD;
} }
int zmq::ctx_t::terminate () int zmq::ctx_t::terminate ()