diff options
Diffstat (limited to 'cpp/test/IceStorm/federation/Subscriber.cpp')
| -rw-r--r-- | cpp/test/IceStorm/federation/Subscriber.cpp | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/cpp/test/IceStorm/federation/Subscriber.cpp b/cpp/test/IceStorm/federation/Subscriber.cpp index d7aaf91d256..181d1e839e1 100644 --- a/cpp/test/IceStorm/federation/Subscriber.cpp +++ b/cpp/test/IceStorm/federation/Subscriber.cpp @@ -61,31 +61,9 @@ int EventI::_count = 0; IceUtil::StaticMutex EventI::_countMutex = ICE_STATIC_MUTEX_INITIALIZER; void -createLock(const string& name) -{ - int fd = open(name.c_str(), O_CREAT | O_WRONLY | O_EXCL, 0777); - assert(fd != -1); - close(fd); -} - -void -deleteLock(const string& name) -{ -#ifdef _WIN32 - int ret = _unlink(name.c_str()); -#else -# ifndef NDEBUG - int ret = -# endif - unlink(name.c_str()); -#endif - assert(ret != -1); -} - -void usage(const char* appName) { - cerr << "Usage: " << appName << " [options] [lockfile]\n"; + cerr << "Usage: " << appName << " [options]\n"; cerr << "Options:\n" "-h, --help Show this message.\n" @@ -96,7 +74,6 @@ usage(const char* appName) int run(int argc, char* argv[], const CommunicatorPtr& communicator) { - string lockfile = "subscriber.lock"; bool batch = false; int idx = 1; @@ -123,11 +100,6 @@ run(int argc, char* argv[], const CommunicatorPtr& communicator) usage(argv[0]); return EXIT_FAILURE; } - else - { - lockfile = argv[idx]; - ++idx; - } } PropertiesPtr properties = communicator->getProperties(); @@ -187,16 +159,12 @@ run(int argc, char* argv[], const CommunicatorPtr& communicator) fed2->subscribe(qos, objFed2); fed3->subscribe(qos, objFed3); - createLock(lockfile); - communicator->waitForShutdown(); fed1->unsubscribe(objFed1); fed2->unsubscribe(objFed2); fed3->unsubscribe(objFed3); - deleteLock(lockfile); - return EXIT_SUCCESS; } |