GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-23 04:54:26 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/ckolivas/cgminer.git

Browse Source
This commit is contained in:
Paul Sheppard 2012-06-26 12:32:09 -07:00
commit 78d5a81d70
5 changed files with 72 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
cgminer.c
View File

@ -69,9 +69,7 @@ enum workio_commands {
struct workio_cmd { struct workio_cmd {
enum workio_commands cmd; enum workio_commands cmd;
struct thr_info *thr; struct thr_info *thr;
union { struct work *work;
struct work *work;
} u;
bool lagging; bool lagging;
}; };
@ -1906,7 +1904,7 @@ static void workio_cmd_free(struct workio_cmd *wc)
switch (wc->cmd) { switch (wc->cmd) {
case WC_SUBMIT_WORK: case WC_SUBMIT_WORK:
free_work(wc->u.work); free_work(wc->work);
break; break;
default: /* do nothing */ default: /* do nothing */
break; break;
@ -2166,22 +2164,26 @@ static bool stale_work(struct work *work, bool share)
if (work->mandatory) if (work->mandatory)
return false; return false;
if (share) if (share) {
work_expiry = opt_expiry; if (work->rolltime)
else if (work->rolltime) work_expiry = work->rolltime;
work_expiry = work->rolltime; else
else work_expiry = opt_expiry;
work_expiry = opt_scantime; } else {
/* Don't keep rolling work right up to the expiration */
if (work->rolltime > opt_scantime)
work_expiry = (work->rolltime - opt_scantime) * 2 / 3 + opt_scantime;
else /* Shouldn't happen unless someone increases scantime */
work_expiry = opt_scantime;
}
pool = work->pool; pool = work->pool;
/* Factor in the average getwork delay of this pool, rounding it up to /* Factor in the average getwork delay of this pool, rounding it up to
* the nearest second */ * the nearest second */
getwork_delay = pool->cgminer_pool_stats.getwork_wait_rolling * 5 + 1; getwork_delay = pool->cgminer_pool_stats.getwork_wait_rolling * 5 + 1;
if (!share) { work_expiry -= getwork_delay;
work_expiry -= getwork_delay; if (unlikely(work_expiry < 5))
if (unlikely(work_expiry < 5)) work_expiry = 5;
work_expiry = 5;
} else
work_expiry += getwork_delay;
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
if ((now.tv_sec - work->tv_staged.tv_sec) >= work_expiry) if ((now.tv_sec - work->tv_staged.tv_sec) >= work_expiry)
@ -2213,7 +2215,7 @@ static void check_solve(struct work *work)
static void *submit_work_thread(void *userdata) static void *submit_work_thread(void *userdata)
{ {
struct workio_cmd *wc = (struct workio_cmd *)userdata; struct workio_cmd *wc = (struct workio_cmd *)userdata;
struct work *work = wc->u.work; struct work *work = wc->work;
struct pool *pool = work->pool; struct pool *pool = work->pool;
struct curl_ent *ce; struct curl_ent *ce;
int failures = 0; int failures = 0;
@ -3845,11 +3847,11 @@ bool submit_work_sync(struct thr_info *thr, const struct work *work_in)
return false; return false;
} }
wc->u.work = make_work(); wc->work = make_work();
wc->cmd = WC_SUBMIT_WORK; wc->cmd = WC_SUBMIT_WORK;
wc->thr = thr; wc->thr = thr;
memcpy(wc->u.work, work_in, sizeof(*work_in)); memcpy(wc->work, work_in, sizeof(*work_in));
wc->u.work->share_found_time = time(NULL); wc->work->share_found_time = time(NULL);
applog(LOG_DEBUG, "Pushing submit work to work thread"); applog(LOG_DEBUG, "Pushing submit work to work thread");

30
driver-opencl.c
View File

@ -1346,6 +1346,7 @@ static uint64_t opencl_scanhash(struct thr_info *thr, struct work *work,
struct cgpu_info *gpu = thr->cgpu; struct cgpu_info *gpu = thr->cgpu;
_clState *clState = clStates[thr_id]; _clState *clState = clStates[thr_id];
const cl_kernel *kernel = &clState->kernel; const cl_kernel *kernel = &clState->kernel;
const int dynamic_us = opt_dynamic_interval * 1000;
cl_int status; cl_int status;
size_t globalThreads[1]; size_t globalThreads[1];
@ -1353,28 +1354,29 @@ static uint64_t opencl_scanhash(struct thr_info *thr, struct work *work,
unsigned int threads; unsigned int threads;
unsigned int hashes; unsigned int hashes;
gettimeofday(&gpu->tv_gpustart, NULL);
/* This finish flushes the readbuffer set with CL_FALSE later */ /* This finish flushes the readbuffer set with CL_FALSE later */
clFinish(clState->commandQueue); clFinish(clState->commandQueue);
gettimeofday(&gpu->tv_gpuend, NULL); gettimeofday(&gpu->tv_gpuend, NULL);
if (gpu->dynamic) { if (gpu->dynamic) {
struct timeval diff; struct timeval diff;
suseconds_t gpu_ms; suseconds_t gpu_us;
timersub(&gpu->tv_gpuend, &gpu->tv_gpustart, &diff); timersub(&gpu->tv_gpuend, &gpu->tv_gpustart, &diff);
gpu_ms = diff.tv_sec * 1000 + diff.tv_usec / 1000; gpu_us = diff.tv_sec * 1000000 + diff.tv_usec;
gpu->gpu_ms_average = (gpu->gpu_ms_average + gpu_ms * 0.63) / 1.63; if (likely(gpu_us > 0)) {
gpu->gpu_us_average = (gpu->gpu_us_average + gpu_us * 0.63) / 1.63;
/* Try to not let the GPU be out for longer than 6ms, but /* Try to not let the GPU be out for longer than
* increase intensity when the system is idle, unless * opt_dynamic_interval in ms, but increase
* dynamic is disabled. */ * intensity when the system is idle in dynamic mode */
if (gpu->gpu_ms_average > opt_dynamic_interval) { if (gpu->gpu_us_average > dynamic_us) {
if (gpu->intensity > MIN_INTENSITY) if (gpu->intensity > MIN_INTENSITY)
--gpu->intensity; --gpu->intensity;
} else if (gpu->gpu_ms_average < ((opt_dynamic_interval / 2) ? : 1)) { } else if (gpu->gpu_us_average < dynamic_us / 2) {
if (gpu->intensity < MAX_INTENSITY) if (gpu->intensity < MAX_INTENSITY)
++gpu->intensity; ++gpu->intensity;
}
} }
} }
set_threads_hashes(clState->vwidth, &threads, &hashes, globalThreads, set_threads_hashes(clState->vwidth, &threads, &hashes, globalThreads,
@ -1408,6 +1410,8 @@ static uint64_t opencl_scanhash(struct thr_info *thr, struct work *work,
clFinish(clState->commandQueue); clFinish(clState->commandQueue);
} }
gettimeofday(&gpu->tv_gpustart, NULL);
if (clState->goffset) { if (clState->goffset) {
size_t global_work_offset[1]; size_t global_work_offset[1];

3
driver-ztex.c
View File

@ -63,7 +63,8 @@ static void ztex_detect(void)
struct cgpu_info *ztex; struct cgpu_info *ztex;
cnt = libztex_scanDevices(&ztex_devices); cnt = libztex_scanDevices(&ztex_devices);
applog(LOG_WARNING, "Found %d ztex board(s)", cnt); if (cnt > 0)
applog(LOG_WARNING, "Found %d ztex board%s", cnt, cnt > 1 ? "s" : "");
for (i = 0; i < cnt; i++) { for (i = 0; i < cnt; i++) {
ztex = calloc(1, sizeof(struct cgpu_info)); ztex = calloc(1, sizeof(struct cgpu_info));

32
fpgautils.c
View File

@ -15,6 +15,7 @@
#include <string.h> #include <string.h>
#ifndef WIN32 #ifndef WIN32
#include <errno.h>
#include <termios.h> #include <termios.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
@ -148,7 +149,21 @@ serial_open(const char*devpath, unsigned long baud, signed short timeout, bool p
#ifdef WIN32 #ifdef WIN32
HANDLE hSerial = CreateFile(devpath, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); HANDLE hSerial = CreateFile(devpath, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);
if (unlikely(hSerial == INVALID_HANDLE_VALUE)) if (unlikely(hSerial == INVALID_HANDLE_VALUE))
{
DWORD e = GetLastError();
switch (e) {
case ERROR_ACCESS_DENIED:
applog(LOG_ERR, "Do not have user privileges required to open %s", devpath);
break;
case ERROR_SHARING_VIOLATION:
applog(LOG_ERR, "%s is already in use by another process", devpath);
break;
default:
applog(LOG_DEBUG, "Open %s failed, GetLastError:%u", devpath, e);
break;
}
return -1; return -1;
}
// thanks to af_newbie for pointers about this // thanks to af_newbie for pointers about this
COMMCONFIG comCfg = {0}; COMMCONFIG comCfg = {0};
@ -179,15 +194,28 @@ serial_open(const char*devpath, unsigned long baud, signed short timeout, bool p
int fdDev = open(devpath, O_RDWR | O_CLOEXEC | O_NOCTTY); int fdDev = open(devpath, O_RDWR | O_CLOEXEC | O_NOCTTY);
if (unlikely(fdDev == -1)) if (unlikely(fdDev == -1))
{
if (errno == EACCES)
applog(LOG_ERR, "Do not have user privileges required to open %s", devpath);
else
applog(LOG_DEBUG, "Open %s failed, errno:%d", devpath, errno);
return -1; return -1;
}
struct termios my_termios; struct termios my_termios;
tcgetattr(fdDev, &my_termios); tcgetattr(fdDev, &my_termios);
switch (baud) { switch (baud) {
case 0: break; case 0:
case 115200: my_termios.c_cflag = B115200; break; break;
case 115200:
my_termios.c_cflag &= ~CBAUD;
my_termios.c_cflag |= B115200;
break;
// TODO: try some higher speeds with the Icarus and BFL to see
// if they support them and if setting them makes any difference
default: default:
applog(LOG_WARNING, "Unrecognized baud rate: %lu", baud); applog(LOG_WARNING, "Unrecognized baud rate: %lu", baud);
} }

2
miner.h
View File

@ -351,7 +351,7 @@ struct cgpu_info {
struct timeval tv_gpustart;; struct timeval tv_gpustart;;
struct timeval tv_gpuend; struct timeval tv_gpuend;
double gpu_ms_average; double gpu_us_average;
#endif #endif
float temp; float temp;