Browse Source

api: one decimal is enough for intensity

and fix windows build... missing __func define
2upstream
Tanguy Pruvot 10 years ago
parent
commit
3938dce740
  1. 1
      README.txt
  2. 3
      api.cpp
  3. 1
      ccminer.cpp
  4. 4
      compat.h
  5. 4
      cuda.cpp
  6. 2
      miner.h
  7. 1
      util.cpp

1
README.txt

@ -176,6 +176,7 @@ features. @@ -176,6 +176,7 @@ features.
>>> RELEASE HISTORY <<<
Jan. 24th 2015 v1.5.2
Allow per device intensity, example: -i 20,19.5
Add process CPU priority and affinity mask parameters
Intelligent duplicate shares check feature (enabled if needed)
api: Fan RPM (windows), Cuda threads count, linux kernel ver.

3
api.cpp

@ -31,7 +31,6 @@ @@ -31,7 +31,6 @@
#include <sys/stat.h>
#include <sys/types.h>
#include "compat.h"
#include "miner.h"
#include "nvml.h"
@ -135,7 +134,7 @@ static void gpustatus(int thr_id) @@ -135,7 +134,7 @@ static void gpustatus(int thr_id)
card = device_name[gpuid];
snprintf(buf, sizeof(buf), "GPU=%d;BUS=%hd;CARD=%s;"
"TEMP=%.1f;FAN=%hu;RPM=%hu;FREQ=%d;KHS=%.2f;HWF=%d;I=%.2f;THR=%u|",
"TEMP=%.1f;FAN=%hu;RPM=%hu;FREQ=%d;KHS=%.2f;HWF=%d;I=%.1f;THR=%u|",
gpuid, cgpu->gpu_bus, card, cgpu->gpu_temp, cgpu->gpu_fan,
cgpu->gpu_fan_rpm, cgpu->gpu_clock, cgpu->khashes,
cgpu->hw_errors, cgpu->intensity, cgpu->throughput);

1
ccminer.cpp

@ -40,7 +40,6 @@ @@ -40,7 +40,6 @@
#endif
#endif
#include "compat.h"
#include "miner.h"
#ifdef WIN32

4
compat.h

@ -41,6 +41,10 @@ static __inline int setpriority(int which, int who, int prio) @@ -41,6 +41,10 @@ static __inline int setpriority(int which, int who, int prio)
return -!SetThreadPriority(GetCurrentThread(), prio);
}
#ifdef _MSC_VER
#define __func__ __FUNCTION__
#endif
#endif /* WIN32 */
#endif /* __COMPAT_H__ */

4
cuda.cpp

@ -21,10 +21,6 @@ @@ -21,10 +21,6 @@
#include "cuda_runtime.h"
#ifdef WIN32
#include "compat.h" // sleep
#endif
// CUDA Devices on the System
int cuda_num_devices()
{

2
miner.h

@ -51,6 +51,8 @@ void *alloca (size_t); @@ -51,6 +51,8 @@ void *alloca (size_t);
# endif
#endif
#include "compat.h"
#ifdef __INTELLISENSE__
/* should be in stdint.h but... */
typedef __int64 int64_t;

1
util.cpp

@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
#include <netinet/in.h>
#include <netinet/tcp.h>
#endif
#include "compat.h"
#include "miner.h"
#include "elist.h"

Loading…
Cancel
Save