fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OSX Mem.cpp fix (#70) Thx to @djfinch

Browse source 
* OSX Mem.cp fix
* Fixed current serverTime overflow.
This commit is contained in:
djfinch 2018-03-19 23:04:19 +01:00 • committed by Ben Gräf
parent 3908ea7b1d
commit f652fe5b06
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
index.html
View file

@ -89,7 +89,7 @@
$(document).ready(function() { $(document).ready(function() {
var table = $('#clientStatusList').DataTable({ var table = $('#clientStatusList').DataTable({
dom: "<'row'<'col-sm-9'B><'col-sm-3'f>><'row'<'col-sm-12't>><'row'<'col-sm-10'i><'col-sm-2'<'#serverTime'>>>", dom: "<'row'<'col-sm-9'B><'col-sm-3'f>><'row'<'col-sm-12't>><'row'<'col-sm-4'i><'col-sm-8'<'#serverTime'>>>",
bPaginate: false, bPaginate: false,
ajax: { ajax: {
url: "/admin/getClientStatusList", url: "/admin/getClientStatusList",
@ -329,7 +329,7 @@
currentServerTime = settings.json.current_server_time * 1000; currentServerTime = settings.json.current_server_time * 1000;
clockDrift = new Date().getTime() - currentServerTime; clockDrift = new Date().getTime() - currentServerTime;
$('#serverTime').html("<div class='dataTables_info'>" + new Date(currentServerTime) + "</div>"); $('#serverTime').html("<div class='dataTables_info text-right'>" + new Date(currentServerTime) + "</div>");
}); });
table.on('select', function () { table.on('select', function () {

2
src/Mem.cpp
View file

@ -34,7 +34,7 @@ int Mem::m_flags = 0;
size_t Mem::m_hashFactor = 1; size_t Mem::m_hashFactor = 1;
size_t Mem::m_threads = 0; size_t Mem::m_threads = 0;
size_t Mem::m_memorySize = 0; size_t Mem::m_memorySize = 0;
uint8_t *Mem::m_memory = nullptr; alignas(16) uint8_t *Mem::m_memory = nullptr;
Mem::ThreadBitSet Mem::m_multiHashThreadMask = Mem::ThreadBitSet(-1L); Mem::ThreadBitSet Mem::m_multiHashThreadMask = Mem::ThreadBitSet(-1L);
cryptonight_ctx *Mem::create(int threadId) cryptonight_ctx *Mem::create(int threadId)

4
src/Mem.h
View file

@ -27,8 +27,8 @@
#define __MEM_H__ #define __MEM_H__
#include <cstddef> #include <stddef.h>
#include <cstdint> #include <stdint.h>
#include <bitset> #include <bitset>
#include "Options.h" #include "Options.h"