summaryrefslogtreecommitdiff
path: root/cpp/src/IceStorm/IceStormDB.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceStorm/IceStormDB.cpp')
-rw-r--r--cpp/src/IceStorm/IceStormDB.cpp153
1 files changed, 81 insertions, 72 deletions
diff --git a/cpp/src/IceStorm/IceStormDB.cpp b/cpp/src/IceStorm/IceStormDB.cpp
index 7fc13ef3a65..29785c65f83 100644
--- a/cpp/src/IceStorm/IceStormDB.cpp
+++ b/cpp/src/IceStorm/IceStormDB.cpp
@@ -17,39 +17,50 @@
#include <fstream>
using namespace std;
-using namespace Ice;
using namespace IceInternal;
-using namespace IceStorm;
-using namespace IceStormElection;
-class Client : public Ice::Application
-{
-public:
+int run(const Ice::StringSeq&);
- void usage();
- virtual int run(int, char*[]);
-};
+Ice::CommunicatorPtr communicator;
-#ifdef _WIN32
+void
+destroyCommunicator(int)
+{
+ communicator->destroy();
+}
int
+#ifdef _WIN32
wmain(int argc, wchar_t* argv[])
-
#else
-
-int
main(int argc, char* argv[])
-
#endif
{
- Client app;
- return app.main(argc, argv);
+ int status = 0;
+
+ try
+ {
+ Ice::CtrlCHandler ctrlCHandler;
+ Ice::CommunicatorHolder ich(argc, argv);
+ communicator = ich.communicator();
+
+ ctrlCHandler.setCallback(&destroyCommunicator);
+
+ status = run(Ice::argsToStringSeq(argc, argv));
+ }
+ catch(const std::exception& ex)
+ {
+ consoleErr << ex.what() << endl;
+ status = 1;
+ }
+
+ return status;
}
void
-Client::usage()
+usage(const string& name)
{
- consoleErr << "Usage: " << appName() << " <options>\n";
+ consoleErr << "Usage: " << name << " <options>\n";
consoleErr <<
"Options:\n"
"-h, --help Show this message.\n"
@@ -64,7 +75,7 @@ Client::usage()
}
int
-Client::run(int argc, char* argv[])
+run(const Ice::StringSeq& args)
{
IceUtilInternal::Options opts;
opts.addOpt("h", "help");
@@ -76,48 +87,46 @@ Client::run(int argc, char* argv[])
opts.addOpt("", "dbpath", IceUtilInternal::Options::NeedArg);
opts.addOpt("", "mapsize", IceUtilInternal::Options::NeedArg);
- vector<string> args;
try
{
- args = opts.parse(argc, const_cast<const char**>(argv));
+ if(!opts.parse(args).empty())
+ {
+ consoleErr << args[0] << ": too many arguments" << endl;
+ usage(args[0]);
+ return 1;
+ }
}
catch(const IceUtilInternal::BadOptException& e)
{
- consoleErr << argv[0] << ": " << e.reason << endl;
- usage();
- return EXIT_FAILURE;
- }
- if(!args.empty())
- {
- consoleErr << argv[0] << ": too many arguments" << endl;
- usage();
- return EXIT_FAILURE;
+ consoleErr << args[0] << ": " << e.reason << endl;
+ usage(args[0]);
+ return 1;
}
if(opts.isSet("help"))
{
- usage();
- return EXIT_SUCCESS;
+ usage(args[0]);
+ return 0;
}
if(opts.isSet("version"))
{
consoleOut << ICE_STRING_VERSION << endl;
- return EXIT_SUCCESS;
+ return 0;
}
if(!(opts.isSet("import") ^ opts.isSet("export")))
{
- consoleErr << argv[0] << ": either --import or --export must be set" << endl;
- usage();
- return EXIT_FAILURE;
+ consoleErr << args[0] << ": either --import or --export must be set" << endl;
+ usage(args[0]);
+ return 1;
}
if(!(opts.isSet("dbhome") ^ opts.isSet("dbpath")))
{
- consoleErr << argv[0] << ": set the database environment directory with either --dbhome or --dbpath" << endl;
- usage();
- return EXIT_FAILURE;
+ consoleErr << args[0] << ": set the database environment directory with either --dbhome or --dbpath" << endl;
+ usage(args[0]);
+ return 1;
}
bool debug = opts.isSet("debug");
@@ -141,7 +150,7 @@ Client::run(int argc, char* argv[])
IceStorm::AllData data;
IceDB::IceContext dbContext;
- dbContext.communicator = communicator();
+ dbContext.communicator = communicator;
dbContext.encoding.major = 1;
dbContext.encoding.minor = 1;
@@ -151,22 +160,22 @@ Client::run(int argc, char* argv[])
if(!IceUtilInternal::directoryExists(dbPath))
{
- consoleErr << argv[0] << ": output directory does not exist: " << dbPath << endl;
- return EXIT_FAILURE;
+ consoleErr << args[0] << ": output directory does not exist: " << dbPath << endl;
+ return 1;
}
if(!IceUtilInternal::isEmptyDirectory(dbPath))
{
- consoleErr << argv[0] << ": output directory is not empty: " << dbPath << endl;
- return EXIT_FAILURE;
+ consoleErr << args[0] << ": output directory is not empty: " << dbPath << endl;
+ return 1;
}
ifstream fs(IceUtilInternal::streamFilename(dbFile).c_str(), ios::binary);
if(fs.fail())
{
- consoleErr << argv[0] << ": could not open input file: " << IceUtilInternal::errorToString(errno)
+ consoleErr << args[0] << ": could not open input file: " << IceUtilInternal::errorToString(errno)
<< endl;
- return EXIT_FAILURE;
+ return 1;
}
fs.unsetf(ios::skipws);
@@ -176,8 +185,8 @@ Client::run(int argc, char* argv[])
if(!fileSize)
{
fs.close();
- consoleErr << argv[0] << ": empty input file" << endl;
- return EXIT_FAILURE;
+ consoleErr << args[0] << ": empty input file" << endl;
+ return 1;
}
fs.seekg(0, ios::beg);
@@ -191,12 +200,12 @@ Client::run(int argc, char* argv[])
string type;
int version;
- Ice::InputStream stream(communicator(), dbContext.encoding, buf);
+ Ice::InputStream stream(communicator, dbContext.encoding, buf);
stream.read(type);
if(type != "IceStorm")
{
- consoleErr << argv[0] << ": incorrect input file type: " << type << endl;
- return EXIT_FAILURE;
+ consoleErr << args[0] << ": incorrect input file type: " << type << endl;
+ return 1;
}
stream.read(version);
stream.read(data);
@@ -210,10 +219,10 @@ Client::run(int argc, char* argv[])
consoleOut << "Writing LLU Map:" << endl;
}
- IceDB::Dbi<string, LogUpdate, IceDB::IceContext, Ice::OutputStream>
+ IceDB::Dbi<string,IceStormElection::LogUpdate, IceDB::IceContext, Ice::OutputStream>
lluMap(txn, "llu", dbContext, MDB_CREATE);
- for(StringLogUpdateDict::const_iterator p = data.llus.begin(); p != data.llus.end(); ++p)
+ for(IceStormElection::StringLogUpdateDict::const_iterator p = data.llus.begin(); p != data.llus.end(); ++p)
{
if(debug)
{
@@ -227,15 +236,15 @@ Client::run(int argc, char* argv[])
consoleOut << "Writing Subscriber Map:" << endl;
}
- IceDB::Dbi<SubscriberRecordKey, SubscriberRecord, IceDB::IceContext, Ice::OutputStream>
+ IceDB::Dbi<IceStorm::SubscriberRecordKey, IceStorm::SubscriberRecord, IceDB::IceContext, Ice::OutputStream>
subscriberMap(txn, "subscribers", dbContext, MDB_CREATE);
- for(SubscriberRecordDict::const_iterator q = data.subscribers.begin(); q != data.subscribers.end(); ++q)
+ for(IceStorm::SubscriberRecordDict::const_iterator q = data.subscribers.begin(); q != data.subscribers.end(); ++q)
{
if(debug)
{
- consoleOut << " KEY = TOPIC(" << communicator()->identityToString(q->first.topic)
- << ") ID(" << communicator()->identityToString(q->first.id) << ")" << endl;
+ consoleOut << " KEY = TOPIC(" << communicator->identityToString(q->first.topic)
+ << ") ID(" << communicator->identityToString(q->first.id) << ")" << endl;
}
subscriberMap.put(txn, q->first, q->second);
}
@@ -257,12 +266,12 @@ Client::run(int argc, char* argv[])
consoleOut << "Reading LLU Map:" << endl;
}
- IceDB::Dbi<string, LogUpdate, IceDB::IceContext, Ice::OutputStream>
+ IceDB::Dbi<string, IceStormElection::LogUpdate, IceDB::IceContext, Ice::OutputStream>
lluMap(txn, "llu", dbContext, 0);
string s;
- LogUpdate llu;
- IceDB::ReadOnlyCursor<string, LogUpdate, IceDB::IceContext, Ice::OutputStream> lluCursor(lluMap, txn);
+ IceStormElection::LogUpdate llu;
+ IceDB::ReadOnlyCursor<string, IceStormElection::LogUpdate, IceDB::IceContext, Ice::OutputStream> lluCursor(lluMap, txn);
while(lluCursor.get(s, llu, MDB_NEXT))
{
if(debug)
@@ -278,19 +287,19 @@ Client::run(int argc, char* argv[])
consoleOut << "Reading Subscriber Map:" << endl;
}
- IceDB::Dbi<SubscriberRecordKey, SubscriberRecord, IceDB::IceContext, Ice::OutputStream>
+ IceDB::Dbi<IceStorm::SubscriberRecordKey, IceStorm::SubscriberRecord, IceDB::IceContext, Ice::OutputStream>
subscriberMap(txn, "subscribers", dbContext, 0);
- SubscriberRecordKey key;
- SubscriberRecord record;
- IceDB::ReadOnlyCursor<SubscriberRecordKey, SubscriberRecord, IceDB::IceContext, Ice::OutputStream>
+ IceStorm::SubscriberRecordKey key;
+ IceStorm::SubscriberRecord record;
+ IceDB::ReadOnlyCursor<IceStorm::SubscriberRecordKey, IceStorm::SubscriberRecord, IceDB::IceContext, Ice::OutputStream>
subCursor(subscriberMap, txn);
while(subCursor.get(key, record, MDB_NEXT))
{
if(debug)
{
- consoleOut << " KEY = TOPIC(" << communicator()->identityToString(key.topic)
- << ") ID(" << communicator()->identityToString(key.id) << ")" << endl;
+ consoleOut << " KEY = TOPIC(" << communicator->identityToString(key.topic)
+ << ") ID(" << communicator->identityToString(key.id) << ")" << endl;
}
data.subscribers.insert(std::make_pair(key, record));
}
@@ -300,7 +309,7 @@ Client::run(int argc, char* argv[])
env.close();
}
- Ice::OutputStream stream(communicator(), dbContext.encoding);
+ Ice::OutputStream stream(communicator, dbContext.encoding);
stream.write("IceStorm");
stream.write(ICE_INT_VERSION);
stream.write(data);
@@ -308,9 +317,9 @@ Client::run(int argc, char* argv[])
ofstream fs(IceUtilInternal::streamFilename(dbFile).c_str(), ios::binary);
if(fs.fail())
{
- consoleErr << argv[0] << ": could not open output file: " << IceUtilInternal::errorToString(errno)
+ consoleErr << args[0] << ": could not open output file: " << IceUtilInternal::errorToString(errno)
<< endl;
- return EXIT_FAILURE;
+ return 1;
}
fs.write(reinterpret_cast<const char*>(stream.b.begin()), stream.b.size());
fs.close();
@@ -318,9 +327,9 @@ Client::run(int argc, char* argv[])
}
catch(const IceUtil::Exception& ex)
{
- consoleErr << argv[0] << ": " << (import ? "import" : "export") << " failed:\n" << ex << endl;
- return EXIT_FAILURE;
+ consoleErr << args[0] << ": " << (import ? "import" : "export") << " failed:\n" << ex << endl;
+ return 1;
}
- return EXIT_SUCCESS;
+ return 0;
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 19:27:15 +0000