BenDroid
327a9b20d7
Merge branch 'master'
...
Conflicts:
src/net/Client.cpp
2018-03-02 23:22:06 +01:00
BenDroid
ac805bd56f
Fixed merge issues
2018-03-02 21:54:23 +01:00
BenDroid
f171801a61
Manual merge
2018-03-02 21:29:53 +01:00
BenDroid
892c7207fb
Merge remote-tracking branch 'refs/remotes/xmrig/master'
...
Conflicts:
CHANGELOG.md
README.md
src/App.cpp
src/App.h
src/Cpu.cpp
src/Options.cpp
src/Options.h
src/crypto/CryptoNight_arm.h
src/crypto/CryptoNight_x86.h
src/version.h
2018-03-02 21:29:33 +01:00
BenDroid
30069aef22
Fixed merging
2018-03-02 20:51:48 +01:00
BenDroid
7ad143a0ac
Merge branch 'master'
...
Conflicts:
src/cc/Httpd.cpp
2018-03-02 20:49:05 +01:00
BenDroid
38f06ac4ca
Increased network connection timeouts
2018-03-02 20:48:15 +01:00
BenDr0id
fa96fc6faf
Merge remote-tracking branch 'origin/dev_tls' into dev_tls
2018-03-01 17:44:27 +01:00
BenDr0id
972f542901
Fixed TLS build on Windows GCC/MVSC
...
Cleanup TLS compile
2018-03-01 17:44:15 +01:00
Unknown
12fa14f034
Made executable names of miner and daemon settable via CMake parameters.
2018-03-01 13:10:55 +01:00
Ben Gräf
bc110ef162
Update Options.cpp
2018-02-26 11:44:37 +01:00
BenDr0id
246f6bcebd
Cleanup
2018-02-26 09:19:46 +01:00
BenDroid
be293d72cd
Cleanup and added integrated tls config params parsing
2018-02-25 23:32:51 +01:00
BenDroid
16fff2fd51
Added clibs-net and clibs-buffer to 3rdparty
2018-02-25 22:10:49 +01:00
BenDroid
b5cba7bf57
Added SSL/TLS support to stratum communication
2018-02-25 22:06:40 +01:00
BenDr0id
d6f27624b7
Merge remote-tracking branch 'origin/master' into dev_tls
2018-02-22 08:36:12 +01:00
BenDroid
8fd88a4e11
Manual merged #43 Mac OS Compilation fixes
2018-02-21 23:17:11 +01:00
BenDroid
204835a3f3
Fixed hugepages on MacOSx
2018-02-21 23:09:29 +01:00
XMRig
def56d5233
v2.4.5 RC
2018-02-19 04:31:50 +07:00
BenDroid
bcbda15832
Added tls flag to Url
2018-02-09 20:16:07 +01:00
BenDroid
f97a7fb121
Fixed behavior for non-tls mode
2018-02-09 20:15:11 +01:00
XMRig
8a3b8ff788
Fix code style, replace tabs to space #2 .
2018-02-08 17:21:12 +07:00
XMRig
9cf2b0a782
Fix code style, replace tabs to space.
2018-02-08 17:02:32 +07:00
XMRig
640592ad95
Merge branch 'master' of https://github.com/Foudge/xmrig into Foudge-master
2018-02-08 16:56:20 +07:00
BenDroid
80c0381dc7
Fixed Uptime column in Dashboard
...
Implemented HTTPS for miner -> server and server -> dashboard
2018-02-06 21:43:53 +01:00
BenDroid
1b7b48f6e3
Added miner uptime to dashboard
...
WIP SSL/TLS for CC communication and Dashboard
2018-02-05 22:53:38 +01:00
Foudge
0184647f7e
Correct L2 cache size calculation for Intel Core 2 family
...
This is a workaround for total L2 cache size calculation of Intel Core Solo, Core Duo, Core 2 Duo, Core 2 Quad and their Xeon homologue. These processors have L2 cache shared by 2 cores.
There is maybe more CPU with L2 shared cache, but I am sure that these models are concerned and they are not so numerous.
A better way would be to modify libcpuid to implement L2 cache counting.
2018-02-03 16:31:13 +01:00
Foudge
8869ede7b5
Compilation error under FreeBSD
...
ULONG is not recognized under this OS, so replaced it with more portable definition.
2018-01-28 18:13:00 +01:00
Foudge
50e4f9e3e7
up to 20% perf increase with Cryptonight with non-AES CPU
...
This time, the performance increase is got with MSVC and GCC. On non-AES CPU, there were an useless load/store SSE2 register. The last MSVC "hack" is replaced by a portable code and he's more complete (a load is saved).
On my C2Q6600, with 3 thread, I have +16% with MSVC2015 and +20% with GCC 7.3, compared to official 2.4.4 version.
2018-01-28 12:58:19 +01:00
Foudge
107cf54513
Remove compilation warnings under MSVC
2018-01-27 11:42:22 +01:00
BenDroid
512bbf83de
When miner is offline status now shows "OFFLINE"
...
Cleanup of Readme.md
2018-01-24 21:31:27 +01:00
BenDroid
50a0dbb39f
Fixed 32bit build
2018-01-20 14:49:15 +01:00
XMRig
fd4e37bee7
#341 Added option --dry-run.
2018-01-20 20:43:31 +07:00
BenDroid
ba3a62ca88
Fixed arm build and windows build server script
2018-01-20 13:46:46 +01:00
sebastianstolzenberg
b2301c07ca
Fixes stub build break and maybe also arm ( #31 )
2018-01-20 13:34:56 +01:00
Foudge
7c79ecb786
+15% boost with non-AES CPU
...
Performance boost validated on Core 2 Quad processor under Windows 10.
But it's Windows/MS Visual C++ specific.
2018-01-20 10:43:56 +01:00
XMRig
d099bef71f
#341 Fix wrong exit code.
2018-01-20 12:58:43 +07:00
Ben Gräf
acf27e9341
Preparation for #1.4.0 ( #30 )
...
- Fixed CPU affinity on Windows for NUMA and CPUs with lot of cores
- Implemented per thread configurable Multihash mode (double, triple, quadruple, quintuple)
- Rebased from XMRig 2.4.4
2018-01-19 19:42:06 +01:00
BenDroid
5f8ea98764
Merge remote-tracking branch 'refs/remotes/xmrig/master'
...
Conflicts:
CHANGELOG.md
README.md
src/version.h
2018-01-19 19:25:31 +01:00
BenDroid
c7d9074ab4
Fixed windows gcc build issues
2018-01-14 19:57:59 +01:00
BenDroid
34f7fcc957
Merge remote-tracking branch 'refs/remotes/origin/master'
...
Conflicts:
src/cc/XMRigd.cpp
2018-01-14 19:16:10 +01:00
BenDroid
60c72eaaea
Preparation for #1.3.2
2018-01-14 19:15:08 +01:00
BenDroid
e8d8d4e866
Fixed for freebsd
2018-01-12 23:12:39 +01:00
BenDroid
e7bf633010
Integrated config less startup with only given CCServer and token #14
...
Fixed time drift issues on dashboard by sending server time to dashboard and use this for comparisson
2018-01-12 23:11:00 +01:00
XMRig
f8481a4430
#328 Added guard to prevent paused message spam and crash.
2018-01-10 22:55:45 +07:00
XMRig
409741ddc1
Fix version.
2018-01-10 16:56:08 +07:00
XMRig
1c68ca4f9d
Add libmicrohttpd version to --version output.
2018-01-05 19:41:19 +07:00
XMRig
5b6045d398
Fix recent MSVC 2017 version detection.
2018-01-05 17:23:39 +07:00
BenDroid
0d652508b1
Preparation for #1.3.1
2018-01-04 21:19:13 +01:00
BenDr0id
e12b0070a9
Merge remote-tracking branch 'xmrig/master' into dev
2018-01-04 17:34:52 +01:00