aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/bitcoind.cpp136
-rw-r--r--src/init.cpp134
-rw-r--r--src/makefile.linux-mingw3
-rw-r--r--src/makefile.mingw3
-rw-r--r--src/makefile.osx3
-rw-r--r--src/makefile.unix3
6 files changed, 144 insertions, 138 deletions
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
new file mode 100644
index 0000000000..81f67802da
--- /dev/null
+++ b/src/bitcoind.cpp
@@ -0,0 +1,136 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2012 The Bitcoin developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "init.h"
+#include "bitcoinrpc.h"
+#include <boost/algorithm/string/predicate.hpp>
+
+void DetectShutdownThread(boost::thread_group* threadGroup)
+{
+ bool shutdown = ShutdownRequested();
+ // Tell the main threads to shutdown.
+ while (!shutdown)
+ {
+ MilliSleep(200);
+ shutdown = ShutdownRequested();
+ }
+ if (threadGroup)
+ threadGroup->interrupt_all();
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Start
+//
+bool AppInit(int argc, char* argv[])
+{
+ boost::thread_group threadGroup;
+ boost::thread* detectShutdownThread = NULL;
+
+ bool fRet = false;
+ try
+ {
+ //
+ // Parameters
+ //
+ // If Qt is used, parameters/bitcoin.conf are parsed in qt/bitcoin.cpp's main()
+ ParseParameters(argc, argv);
+ if (!boost::filesystem::is_directory(GetDataDir(false)))
+ {
+ fprintf(stderr, "Error: Specified directory does not exist\n");
+ Shutdown();
+ }
+ ReadConfigFile(mapArgs, mapMultiArgs);
+
+ if (mapArgs.count("-?") || mapArgs.count("--help"))
+ {
+ // First part of help message is specific to bitcoind / RPC client
+ std::string strUsage = _("Bitcoin version") + " " + FormatFullVersion() + "\n\n" +
+ _("Usage:") + "\n" +
+ " bitcoind [options] " + "\n" +
+ " bitcoind [options] <command> [params] " + _("Send command to -server or bitcoind") + "\n" +
+ " bitcoind [options] help " + _("List commands") + "\n" +
+ " bitcoind [options] help <command> " + _("Get help for a command") + "\n";
+
+ strUsage += "\n" + HelpMessage();
+
+ fprintf(stdout, "%s", strUsage.c_str());
+ return false;
+ }
+
+ // Command-line RPC
+ for (int i = 1; i < argc; i++)
+ if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "bitcoin:"))
+ fCommandLine = true;
+
+ if (fCommandLine)
+ {
+ int ret = CommandLineRPC(argc, argv);
+ exit(ret);
+ }
+#if !defined(WIN32)
+ fDaemon = GetBoolArg("-daemon", false);
+ if (fDaemon)
+ {
+ // Daemonize
+ pid_t pid = fork();
+ if (pid < 0)
+ {
+ fprintf(stderr, "Error: fork() returned %d errno %d\n", pid, errno);
+ return false;
+ }
+ if (pid > 0) // Parent process, pid is child process id
+ {
+ CreatePidFile(GetPidFile(), pid);
+ return true;
+ }
+ // Child process falls through to rest of initialization
+
+ pid_t sid = setsid();
+ if (sid < 0)
+ fprintf(stderr, "Error: setsid() returned %d errno %d\n", sid, errno);
+ }
+#endif
+
+ detectShutdownThread = new boost::thread(boost::bind(&DetectShutdownThread, &threadGroup));
+ fRet = AppInit2(threadGroup);
+ }
+ catch (std::exception& e) {
+ PrintExceptionContinue(&e, "AppInit()");
+ } catch (...) {
+ PrintExceptionContinue(NULL, "AppInit()");
+ }
+ if (!fRet) {
+ if (detectShutdownThread)
+ detectShutdownThread->interrupt();
+ threadGroup.interrupt_all();
+ }
+
+ if (detectShutdownThread)
+ {
+ detectShutdownThread->join();
+ delete detectShutdownThread;
+ detectShutdownThread = NULL;
+ }
+ Shutdown();
+
+ return fRet;
+}
+
+extern void noui_connect();
+int main(int argc, char* argv[])
+{
+ bool fRet = false;
+
+ // Connect bitcoind signal handlers
+ noui_connect();
+
+ fRet = AppInit(argc, argv);
+
+ if (fRet && fDaemon)
+ return 0;
+
+ return (fRet ? 0 : 1);
+}
diff --git a/src/init.cpp b/src/init.cpp
index 6777f48d57..e9e5e278b0 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -121,19 +121,6 @@ void Shutdown()
//
// Signal handlers are very limited in what they are allowed to do, so:
//
-void DetectShutdownThread(boost::thread_group* threadGroup)
-{
- bool shutdown = ShutdownRequested();
- // Tell the main threads to shutdown.
- while (!shutdown)
- {
- MilliSleep(200);
- shutdown = ShutdownRequested();
- }
- if (threadGroup)
- threadGroup->interrupt_all();
-}
-
void HandleSIGTERM(int)
{
fRequestShutdown = true;
@@ -144,127 +131,6 @@ void HandleSIGHUP(int)
fReopenDebugLog = true;
}
-
-
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Start
-//
-#if !defined(QT_GUI)
-bool AppInit(int argc, char* argv[])
-{
- boost::thread_group threadGroup;
- boost::thread* detectShutdownThread = NULL;
-
- bool fRet = false;
- try
- {
- //
- // Parameters
- //
- // If Qt is used, parameters/bitcoin.conf are parsed in qt/bitcoin.cpp's main()
- ParseParameters(argc, argv);
- if (!boost::filesystem::is_directory(GetDataDir(false)))
- {
- fprintf(stderr, "Error: Specified directory does not exist\n");
- Shutdown();
- }
- ReadConfigFile(mapArgs, mapMultiArgs);
-
- if (mapArgs.count("-?") || mapArgs.count("--help"))
- {
- // First part of help message is specific to bitcoind / RPC client
- std::string strUsage = _("Bitcoin version") + " " + FormatFullVersion() + "\n\n" +
- _("Usage:") + "\n" +
- " bitcoind [options] " + "\n" +
- " bitcoind [options] <command> [params] " + _("Send command to -server or bitcoind") + "\n" +
- " bitcoind [options] help " + _("List commands") + "\n" +
- " bitcoind [options] help <command> " + _("Get help for a command") + "\n";
-
- strUsage += "\n" + HelpMessage();
-
- fprintf(stdout, "%s", strUsage.c_str());
- return false;
- }
-
- // Command-line RPC
- for (int i = 1; i < argc; i++)
- if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "bitcoin:"))
- fCommandLine = true;
-
- if (fCommandLine)
- {
- int ret = CommandLineRPC(argc, argv);
- exit(ret);
- }
-#if !defined(WIN32)
- fDaemon = GetBoolArg("-daemon", false);
- if (fDaemon)
- {
- // Daemonize
- pid_t pid = fork();
- if (pid < 0)
- {
- fprintf(stderr, "Error: fork() returned %d errno %d\n", pid, errno);
- return false;
- }
- if (pid > 0) // Parent process, pid is child process id
- {
- CreatePidFile(GetPidFile(), pid);
- return true;
- }
- // Child process falls through to rest of initialization
-
- pid_t sid = setsid();
- if (sid < 0)
- fprintf(stderr, "Error: setsid() returned %d errno %d\n", sid, errno);
- }
-#endif
-
- detectShutdownThread = new boost::thread(boost::bind(&DetectShutdownThread, &threadGroup));
- fRet = AppInit2(threadGroup);
- }
- catch (std::exception& e) {
- PrintExceptionContinue(&e, "AppInit()");
- } catch (...) {
- PrintExceptionContinue(NULL, "AppInit()");
- }
- if (!fRet) {
- if (detectShutdownThread)
- detectShutdownThread->interrupt();
- threadGroup.interrupt_all();
- }
-
- if (detectShutdownThread)
- {
- detectShutdownThread->join();
- delete detectShutdownThread;
- detectShutdownThread = NULL;
- }
- Shutdown();
-
- return fRet;
-}
-
-extern void noui_connect();
-int main(int argc, char* argv[])
-{
- bool fRet = false;
-
- // Connect bitcoind signal handlers
- noui_connect();
-
- fRet = AppInit(argc, argv);
-
- if (fRet && fDaemon)
- return 0;
-
- return (fRet ? 0 : 1);
-}
-#endif
-
bool static InitError(const std::string &str)
{
uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_ERROR);
diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
index 7719cd2637..114a9491bd 100644
--- a/src/makefile.linux-mingw
+++ b/src/makefile.linux-mingw
@@ -71,6 +71,7 @@ OBJS= \
obj/key.o \
obj/db.o \
obj/init.o \
+ obj/bitcoind.o \
obj/keystore.o \
obj/main.o \
obj/net.o \
@@ -116,7 +117,7 @@ TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
obj-test/%.o: test/%.cpp $(HEADERS)
$(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -o $@ $<
-test_bitcoin.exe: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
+test_bitcoin.exe: $(TESTOBJS) $(filter-out obj/init.o obj/bitcoind.o,$(OBJS:obj/%=obj/%))
$(CXX) $(xCXXFLAGS) $(xLDFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework-mt-s $(LIBS)
diff --git a/src/makefile.mingw b/src/makefile.mingw
index 8b5a5dccd9..34ddc3eece 100644
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -79,6 +79,7 @@ OBJS= \
obj/key.o \
obj/db.o \
obj/init.o \
+ obj/bitcoind.o \
obj/keystore.o \
obj/main.o \
obj/net.o \
@@ -127,7 +128,7 @@ TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
obj-test/%.o: test/%.cpp $(HEADERS)
$(CXX) -c $(TESTDEFS) $(CFLAGS) -o $@ $<
-test_bitcoin.exe: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
+test_bitcoin.exe: $(TESTOBJS) $(filter-out obj/init.o obj/bitcoind.o,$(OBJS:obj/%=obj/%))
$(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework$(BOOST_SUFFIX) $(LIBS)
clean:
diff --git a/src/makefile.osx b/src/makefile.osx
index 50279fdb05..4ee0edcb95 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -82,6 +82,7 @@ OBJS= \
obj/key.o \
obj/db.o \
obj/init.o \
+ obj/bitcoind.o \
obj/keystore.o \
obj/main.o \
obj/net.o \
@@ -162,7 +163,7 @@ obj-test/%.o: test/%.cpp
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d)
-test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
+test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o obj/bitcoind.o,$(OBJS:obj/%=obj/%))
$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) $(TESTLIBS)
clean:
diff --git a/src/makefile.unix b/src/makefile.unix
index 8110235647..f8042b2930 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -121,6 +121,7 @@ OBJS= \
obj/key.o \
obj/db.o \
obj/init.o \
+ obj/bitcoind.o \
obj/keystore.o \
obj/main.o \
obj/net.o \
@@ -187,7 +188,7 @@ obj-test/%.o: test/%.cpp
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d)
-test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
+test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o obj/bitcoind.o,$(OBJS:obj/%=obj/%))
$(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ $(TESTLIBS) $(xLDFLAGS) $(LIBS)
clean:
generated by cgit v1.2.3 (git 2.26.2) at 2024-07-08 11:09:22 +0000