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

Merge branch 'master' into develop

Browse source
This commit is contained in:
BenDr0id 2018-09-12 11:17:24 +02:00
commit 231e154236
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/cc/GPUInfo.cpp
View file

@ -40,13 +40,13 @@ rapidjson::Value GPUInfo::toJson(rapidjson::MemoryPoolAllocator <rapidjson::CrtA
rapidjson::Value gpuInfo(rapidjson::kObjectType); rapidjson::Value gpuInfo(rapidjson::kObjectType);
gpuInfo.AddMember("name", rapidjson::StringRef(m_name.c_str()), allocator); gpuInfo.AddMember("name", rapidjson::StringRef(m_name.c_str()), allocator);
gpuInfo.AddMember("device_idx", m_deviceIdx, allocator); gpuInfo.AddMember("device_idx", static_cast<uint32_t>(m_deviceIdx), allocator);
gpuInfo.AddMember("raw_intensity", m_rawIntensity, allocator); gpuInfo.AddMember("raw_intensity", static_cast<uint32_t>(m_rawIntensity), allocator);
gpuInfo.AddMember("work_size", m_workSize, allocator); gpuInfo.AddMember("work_size", static_cast<uint32_t>(m_workSize), allocator);
gpuInfo.AddMember("max_work_size", m_maxWorkSize, allocator); gpuInfo.AddMember("max_work_size", static_cast<uint32_t>(m_maxWorkSize), allocator);
gpuInfo.AddMember("free_mem", m_freeMem, allocator); gpuInfo.AddMember("free_mem", static_cast<uint32_t>(m_freeMem), allocator);
gpuInfo.AddMember("mem_chunk", m_memChunk, allocator); gpuInfo.AddMember("mem_chunk", m_memChunk, allocator);
gpuInfo.AddMember("comp_mode", m_memChunk, allocator); gpuInfo.AddMember("comp_mode", m_memChunk, allocator);
gpuInfo.AddMember("compute_units", m_memChunk, allocator); gpuInfo.AddMember("compute_units", m_memChunk, allocator);
return gpuInfo; return gpuInfo;

2
src/config_cc.json
View file

@ -1,7 +1,7 @@
{ {
"background": false, // true to run the cc-server in the background (no console) "background": false, // true to run the cc-server in the background (no console)
"colors": true, // false to disable colored output "colors": true, // false to disable colored output
"log-file": "server.log", // log all output to a file "log-file": null, // log all output to a file
"syslog": false, // use system log for output messages "syslog": false, // use system log for output messages
"cc-server": { "cc-server": {
"port": 3344, // port the CC Server will listens on "port": 3344, // port the CC Server will listens on

2
src/log/FileLog.cpp
View file

@ -98,5 +98,5 @@ void FileLog::write(char *data, size_t size)
uv_fs_t *req = new uv_fs_t; uv_fs_t *req = new uv_fs_t;
req->data = buf.base; req->data = buf.base;
uv_fs_write(uv_default_loop(), req, m_file, &buf, 1, 0, FileLog::onWrite); uv_fs_write(uv_default_loop(), req, m_file, &buf, 1, -1, FileLog::onWrite);
} }