Skip to content

Commit

Permalink
Merge pull request #71 from sjneph/windows-fixes
Browse files Browse the repository at this point in the history
Windows fixes
  • Loading branch information
cygnusxi authored Feb 4, 2022
2 parents 1ba9960 + 53e7950 commit c06a7b2
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 13 deletions.
3 changes: 2 additions & 1 deletion src/compat.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@
#include <ifaddrs.h>
#endif

typedef u_int SOCKET;

#ifdef WIN32
#define MSG_NOSIGNAL 0
#define MSG_DONTWAIT 0
typedef int socklen_t;
#else
typedef u_int SOCKET;
#include "errno.h"
#define WSAGetLastError() errno
#define WSAEINVAL EINVAL
Expand Down
2 changes: 1 addition & 1 deletion src/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ bool AppInit2()
}
if (pid > 0)
{
CreatePidFile(GetPidFile(), pid);
CreatePidFile(GetPidFile(), pid);
return true;
}

Expand Down
9 changes: 5 additions & 4 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "ui_interface.h"
#include "kernel.h"
#include "wallet.h"
#include "util.h"
#include <boost/algorithm/string/replace.hpp>
#include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp>
Expand Down Expand Up @@ -4537,9 +4538,9 @@ void curecoinMiner(CWallet *pwallet, bool fProofOfStake)
}
strMintWarning = "";
printf("CPUMiner : proof-of-stake block found %s\n", pblock->GetHash().ToString().c_str());
SetThreadPriority(THREAD_PRIORITY_NORMAL);
SetThreadPriority(THREAD_PRIORITY_NORMAL);
CheckWork(pblock.get(), *pwalletMain, reservekey);
SetThreadPriority(THREAD_PRIORITY_LOWEST);
SetThreadPriority(THREAD_PRIORITY_LOWEST);
}
Sleep(500);
continue;
Expand Down Expand Up @@ -4589,9 +4590,9 @@ void curecoinMiner(CWallet *pwallet, bool fProofOfStake)
pblock->nNonce = ByteReverse(nNonceFound);
assert(hash == pblock->GetHash());

SetThreadPriority(THREAD_PRIORITY_NORMAL);
SetThreadPriority(THREAD_PRIORITY_NORMAL);
CheckWork(pblock.get(), *pwalletMain, reservekey);
SetThreadPriority(THREAD_PRIORITY_LOWEST);
SetThreadPriority(THREAD_PRIORITY_LOWEST);
break;
}
}
Expand Down
5 changes: 4 additions & 1 deletion src/net.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1738,14 +1738,17 @@ bool BindListenPort(const CService &addrBind, std::string& strError)
// some systems don't have IPV6_V6ONLY but are always v6only; others do have the option
// and enable it by default or not. Try to enable it, if possible.
if (addrBind.IsIPv6()) {
#ifndef WIN32
#ifdef IPV6_V6ONLY
setsockopt(hListenSocket, IPPROTO_IPV6, IPV6_V6ONLY, (void*)&nOne, sizeof(int));
#endif
#ifdef WIN32
#else
int nProtLevel = 10 /* PROTECTION_LEVEL_UNRESTRICTED */;
int nParameterId = 23 /* IPV6_PROTECTION_LEVEl */;
// this call is allowed to fail
#ifdef IPV6_V6ONLY
setsockopt(hListenSocket, IPPROTO_IPV6, nParameterId, (const char*)&nProtLevel, sizeof(int));
#endif
#endif
}
#endif
Expand Down
13 changes: 12 additions & 1 deletion src/util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ namespace boost {
#endif



std::map<std::string, std::string> mapArgs;
std::map<std::string, std::vector<std::string> > mapMultiArgs;
bool fDebug = false;
Expand Down Expand Up @@ -1114,6 +1113,17 @@ boost::filesystem::path GetPidFile()
return pathPidFile;
}

#ifdef WIN32
void CreatePidFile(const boost::filesystem::path &path, util_pid_t pid)
{
FILE* file = fopen(path.string().c_str(), "w");
if (file)
{
fprintf(file, "%d\n", pid);
fclose(file);
}
}
#else
void CreatePidFile(const boost::filesystem::path &path, pid_t pid)
{
FILE* file = fopen(path.string().c_str(), "w");
Expand All @@ -1123,6 +1133,7 @@ void CreatePidFile(const boost::filesystem::path &path, pid_t pid)
fclose(file);
}
}
#endif

bool RenameOver(boost::filesystem::path src, boost::filesystem::path dest)
{
Expand Down
17 changes: 12 additions & 5 deletions src/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,18 @@

#include "uint256.h"

#include <map>
#include <vector>
#include <string>

#ifndef WIN32
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
#else
typedef int pid_t; /* define for Windows compatibility */
#include <processthreadsapi.h>
typedef int util_pid_t; /* define for Windows compatibility */
#endif
#include <map>
#include <vector>
#include <string>

#include <boost/thread.hpp>
#include <boost/filesystem.hpp>
Expand All @@ -29,6 +31,7 @@ typedef int pid_t; /* define for Windows compatibility */

#include "netbase.h" // for AddTimeData


typedef long long int64;
typedef unsigned long long uint64;

Expand Down Expand Up @@ -215,7 +218,11 @@ boost::filesystem::path GetDefaultDataDir();
const boost::filesystem::path &GetDataDir(bool fNetSpecific = true);
boost::filesystem::path GetConfigFile();
boost::filesystem::path GetPidFile();
#ifdef WIN32
void CreatePidFile(const boost::filesystem::path &path, util_pid_t pid);
#else
void CreatePidFile(const boost::filesystem::path &path, pid_t pid);
#endif
void ReadConfigFile(std::map<std::string, std::string>& mapSettingsRet, std::map<std::string, std::vector<std::string> >& mapMultiSettingsRet);
#ifdef WIN32
boost::filesystem::path GetSpecialFolderPath(int nFolder, bool fCreate = true);
Expand Down Expand Up @@ -591,7 +598,7 @@ bool NewThread(void(*pfn)(void*), void* parg);
#ifdef WIN32
inline void SetThreadPriority(int nPriority)
{
SetThreadPriority(GetCurrentThread(), nPriority);
SetThreadPriority(GetCurrentThread(), nPriority);
}
#else

Expand Down

0 comments on commit c06a7b2

Please sign in to comment.