From 66fb32d267d90fe2e1f652570bc45aba26be55fa Mon Sep 17 00:00:00 2001 From: gjs278 Date: Tue, 12 Apr 2011 19:15:19 -0500 Subject: [PATCH] pidfile support for daemon --- init.cpp | 5 +++++ util.cpp | 19 +++++++++++++++++++ util.h | 2 ++ 3 files changed, 26 insertions(+) diff --git a/init.cpp b/init.cpp index effac288f..dcfc6765b 100644 --- a/init.cpp +++ b/init.cpp @@ -41,6 +41,7 @@ void Shutdown(void* parg) DBFlush(false); StopNode(); DBFlush(true); + boost::filesystem::remove(GetPidFile()); CreateThread(ExitTimeout, NULL); Sleep(50); printf("Bitcoin exiting\n\n"); @@ -151,6 +152,7 @@ bool AppInit2(int argc, char* argv[]) " bitcoin [options] help \t\t " + _("Get help for a command\n") + _("Options:\n") + " -conf= \t\t " + _("Specify configuration file (default: bitcoin.conf)\n") + + " -pid= \t\t " + _("Specify pid file (default: bitcoind.pid)\n") + " -gen \t\t " + _("Generate coins\n") + " -gen=0 \t\t " + _("Don't generate coins\n") + " -min \t\t " + _("Start minimized\n") + @@ -251,7 +253,10 @@ bool AppInit2(int argc, char* argv[]) return false; } if (pid > 0) + { + CreatePidFile(GetPidFile(), pid); return true; + } pid_t sid = setsid(); if (sid < 0) diff --git a/util.cpp b/util.cpp index 655626dd3..06da0cb1e 100644 --- a/util.cpp +++ b/util.cpp @@ -747,6 +747,25 @@ void ReadConfigFile(map& mapSettingsRet, } } +string GetPidFile() +{ + namespace fs = boost::filesystem; + fs::path pathConfig(GetArg("-pid", "bitcoind.pid")); + if (!pathConfig.is_complete()) + pathConfig = fs::path(GetDataDir()) / pathConfig; + return pathConfig.string(); +} + +void CreatePidFile(string pidFile, pid_t pid) +{ + FILE* file; + if (file = fopen(pidFile.c_str(), "w")) + { + fprintf(file, "%d\n", pid); + fclose(file); + } +} + int GetFilesize(FILE* file) { int nSavePos = ftell(file); diff --git a/util.h b/util.h index 2a7dbb510..4bd5cb895 100644 --- a/util.h +++ b/util.h @@ -172,6 +172,8 @@ bool WildcardMatch(const string& str, const string& mask); int GetFilesize(FILE* file); void GetDataDir(char* pszDirRet); string GetConfigFile(); +string GetPidFile(); +void CreatePidFile(string pidFile, pid_t pid); void ReadConfigFile(map& mapSettingsRet, map >& mapMultiSettingsRet); #ifdef __WXMSW__ string MyGetSpecialFolderPath(int nFolder, bool fCreate);