GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-10 23:08:07 +00:00
Code Issues Releases Wiki Activity
837 Commits 12 Branches 10 Tags 44 MiB
7d34a6b6e3
Commit Graph

378 Commits

Author SHA1 Message Date
Znort 987
1cbfcba2c1 Disable --monitor-stderr on WIN32 2011-08-13 20:48:30 +10:00
Con Kolivas
467c52bb4a Allocate work from one function to be able to initialise variables added later. 2011-08-13 20:48:03 +10:00
Znort 987
79c989dd48 Add new option: --monitor <cmd> 
Option lets user specify a command <cmd> that will get
    forked by cgminer on startup. cgminer's stderr output
    subsequently gets piped directly to this command.

    This permits smart batch monitoring of the miner by a
    baby-sitter log parser while retaining the full benefit
    of the curses interface, e.g. when running cgminer under
    screen.

    Doing the same thing is possible using advanced bash
    redirection paraphernalia, but it is somewhat of a pain,
    especially when running screen'd.

    This option makes things more straightforward.
 2011-08-13 20:47:25 +10:00
Con Kolivas
1725a1c021 Fix non-opencl build. 2011-07-30 23:19:53 +10:00
Con Kolivas
bc2976f538 Be more willing to get work from the backup pools if the work is simply being queued faster than it is being retrieved. 2011-07-30 21:56:51 +10:00
Con Kolivas
8f186e61e2 Restart threads by abstracting out the clcontext initialisation and using that instead of probing all cards. 2011-07-30 16:59:54 +10:00
Con Kolivas
411570d348 Revert "Don't use asynchronous work with flushes as it decreases reliability and two threads per GPU achieves the same throughput." 
This reverts commit 7223508f7e.

Bad idea. Need to work around sync lineup.
 2011-07-30 16:36:19 +10:00
Con Kolivas
decafea0ad Revert "Read buffers only after reading data back now that we're sync." 
This reverts commit 5f2c3151b4.

Bad idea. Need to rework around sync lineup.
 2011-07-30 16:36:02 +10:00
Con Kolivas
5f2c3151b4 Read buffers only after reading data back now that we're sync. 2011-07-30 16:33:43 +10:00
Con Kolivas
7223508f7e Don't use asynchronous work with flushes as it decreases reliability and two threads per GPU achieves the same throughput. 2011-07-30 16:11:03 +10:00
Con Kolivas
f763b0db10 Don't free up any ram from the dying thread to avoid dereferences. 2011-07-30 14:27:17 +10:00
Con Kolivas
43faa11358 Use correct name in syslog. 2011-07-30 13:37:34 +10:00
Con Kolivas
37115c0e1b RPC call debugging is a mess with \r in it so remove it. 2011-07-30 13:33:52 +10:00
Con Kolivas
59b640870c So we can pthread cancel a stuck thread, but can't pthread join it. 
And we can't tq freeze the old queue or we could hang here.
And we need to re-initialise all the opencl contexts so send a test command and if it succeeds reinit the card.
 2011-07-30 13:28:25 +10:00
Con Kolivas
74a07eb461 Revert "Send threads message to stop and then send cancel message but don't pthread_join them if they're stuck nor reinit the opencl code to not hang everything." 
This reverts commit 62521f3e53.

Not enough to restart a GPU.
 2011-07-30 13:14:59 +10:00
Con Kolivas
e100fcc672 Revert "Send ping to wake up new threads." 
This reverts commit bf4c3626bc.

Prepare to rollback.
 2011-07-30 13:14:47 +10:00
Con Kolivas
bf4c3626bc Send ping to wake up new threads. 2011-07-30 12:00:12 +10:00
Con Kolivas
62521f3e53 Send threads message to stop and then send cancel message but don't pthread_join them if they're stuck nor reinit the opencl code to not hang everything. 2011-07-30 10:16:03 +10:00
Con Kolivas
b2cbaa1ae4 Send a hung device a command. If it returns, try to reinitialise it. 2011-07-30 08:21:17 +10:00
Con Kolivas
a702f599d3 Disable the reinit_thread option till we know it actually works. 2011-07-30 02:31:29 +10:00
Con Kolivas
bb575a5585 Reference correct GPU and only try to restart if it reaches DEAD. 2011-07-30 02:16:29 +10:00
Con Kolivas
947a74bfa3 Differentiate thread failure from GPU failure by declaring a GPU sick first and trying to restart the thread without re-initialising the card. 
If that fails, then try once more at ten minutes and declare it dead.
This should prevent an attempted re-initialising of the GPU from taking out other GPUs.
 2011-07-30 01:23:17 +10:00
Con Kolivas
20ce1ebf2a Typo. 2011-07-29 20:40:57 +10:00
Con Kolivas
3803760689 Reimplement the per-thread getwork count with proper accounting at get_work(). 2011-07-29 11:11:42 +10:00
Con Kolivas
0fe22d8d94 Revert "Only update the thread getwork queue count if it actually results in a getwork request from the server." 
This reverts commit 2e607d44f2.

The count looks far too difficult to add up with this change since many are queued generically.
 2011-07-29 11:02:47 +10:00
Con Kolivas
2e607d44f2 Only update the thread getwork queue count if it actually results in a getwork request from the server. 2011-07-29 10:39:58 +10:00
Con Kolivas
5b9bfedda1 Display the correct current hash as per blockexplorer, truncated to 16 characters, with just the time. 2011-07-29 00:40:47 +10:00
Con Kolivas
c94737ceab Add http:// if it's not explicitly set for URL entries. 2011-07-28 12:44:50 +10:00
Con Kolivas
f0fe82ea37 Some Intel HD graphics support the opencl commands but return errors since they don't support opencl. Don't fail with them, just provide a warning and disable GPU mining. 2011-07-28 10:49:36 +10:00
Con Kolivas
10fa821e33 Update utility and efficiency figures when displaying them. 2011-07-28 10:46:28 +10:00
Con Kolivas
0006eb2da4 Make the "quiet" mode still update the status and display errors, and add a new --real-quiet option which disables all output and can be set once while running. 2011-07-28 10:36:48 +10:00
Con Kolivas
da06a348d0 The work length in the miner thread gets smaller but doesn't get bigger if it's under 1 second. 
This could end up leading to CPU under-utilisation and lower and lower hash rates.
Fix it by increasing work length if it drops under 1 second.
 2011-07-28 10:03:31 +10:00
Con Kolivas
a0924933d0 Restarting a hung GPU can hang the rest of the GPUs so just declare it dead and provide the information in the status. 2011-07-28 09:59:18 +10:00
Con Kolivas
45faff2e26 Add debugging output to all tq_pop calls. 2011-07-27 22:28:41 +10:00
Con Kolivas
2e2b2ba14c Add debugging output to tq_push calls. 2011-07-27 22:20:57 +10:00
Con Kolivas
70fa8f319b Make the display options clearer. 2011-07-27 21:58:08 +10:00
Con Kolivas
c7978f11ed Dividing work is like the work is never removed at all so treat it as such. However the queued bool needs to be reset to ensure we *can* request more work even if we didn't initially. 2011-07-27 20:40:06 +10:00
Con Kolivas
e82e390295 If work has been cloned it is already at the head of the list and when being reinserted into the queue it should be placed back at the head of the list. 2011-07-27 16:40:52 +10:00
Con Kolivas
9c12d49684 Attribute split work as local work generation. 2011-07-27 16:29:37 +10:00
Con Kolivas
720032dacd Make sure to decrease queued count if we discard the work. 2011-07-27 15:11:57 +10:00
Con Kolivas
967acd39bd Don't put an extra work item in the queue as each new device thread will do so itself. 2011-07-27 15:06:04 +10:00
Con Kolivas
82698fbffd Do away with queueing work separately at the start and let each thread grab its own work as soon as it's ready. 2011-07-27 15:01:08 +10:00
Con Kolivas
6cc8d22beb Properly detect stale work based on time from staging and discard instead of handing on, but be more lax about how long work can be divided for up to the scantime. 2011-07-27 14:53:43 +10:00
Con Kolivas
45d5435781 Make cpu mining work submission asynchronous as well. 2011-07-27 14:29:51 +10:00
Con Kolivas
380d145c64 Make threads report out when they're queueing a request and report if they've failed. 2011-07-27 14:03:01 +10:00
Con Kolivas
324dd93bb7 Don't take more than one lock at a time. 2011-07-27 10:36:16 +10:00
Con Kolivas
98f609b5be Sanity check to prove locking. 2011-07-27 10:31:44 +10:00
Con Kolivas
c72840284f Abstract out the decay time function and use it to make hash_div a rolling average so it doesn't change too abruptly and divide work in chunks large enough to guarantee they won't overlap. 2011-07-27 10:00:58 +10:00
Con Kolivas
a48895829e Update both windows separately, but not at the same time to prevent the double refresh crash that old libncurses has. 
Do the window resize check only when about to redraw the log window to minimise ncurses cpu usage.
 2011-07-27 09:41:52 +10:00
Con Kolivas
6f905932af Only free the thread structures if the thread still exists. 2011-07-27 08:32:25 +10:00
Con Kolivas
40bc82d4ca Don't adjust hash_div only up for GPUs. Disable hash_div adjustment for GPUs. 2011-07-27 02:03:59 +10:00
Con Kolivas
1aadfc580b Two redraws in a row cause a crash in old libncurses so just do one redraw using the main window. 2011-07-27 01:41:16 +10:00
Con Kolivas
93b284dbca Best to serialise the restarting of threads to avoid device initialisation issues. 2011-07-26 23:17:25 +10:00
Con Kolivas
d5d56920dd Off by one limit in device selection. 2011-07-26 22:41:42 +10:00
Con Kolivas
f9bc3771b4 The first work item is tricky so don't try and divide it up to begin with. 2011-07-26 21:40:11 +10:00
Con Kolivas
1536e085da Increase efficiency of slow mining threads such as CPU miners dramatically. 
Do this by detecting which threads cannot complete searching a work item within the scantime and then divide up a work item into multiple smaller work items.
Detect the age of the work items and if they've been cloned before to prevent doing the same work over.
If the work is too old to be divided, then see if it can be time rolled and do that to generate work.
This dramatically decreases the number of queued work items from a pool leading to higher overall efficiency (but the same hashrate and share submission rate).
 2011-07-26 20:48:05 +10:00
Con Kolivas
7e7a5f777e Don't request work too early for CPUs as CPUs will scan for the full opt_scantime anyway. 2011-07-26 15:16:39 +10:00
Con Kolivas
6045c4d161 Simplify gpu management enable/disable/restart code. 2011-07-26 13:47:18 +10:00
Con Kolivas
fa17f03432 Implement much more accurate rolling statistics per thread and per gpu and improve accuracy of rolling displayed values. 2011-07-26 11:58:45 +10:00
Con Kolivas
ce6af96821 Make the rolling log-second average more accurate. 2011-07-26 10:45:52 +10:00
Con Kolivas
7707ed4db1 Add a menu to manage GPUs on the fly allowing you to enable/disable GPUs or try restarting them. 
Keep track of which GPUs are alive versus enabled.
Start threads for devices that are even disabled, but don't allow them to start working.
 2011-07-26 10:26:03 +10:00
Con Kolivas
7143c25b72 The last pool is when we are low in total_pools, not active_pools. 2011-07-25 16:44:24 +10:00
Con Kolivas
a53716dc7f Fix compiler warnings. 2011-07-25 13:59:34 +10:00
Con Kolivas
b3d20b573c Make the thread restart do a pthread_join after disabling the device, only re-enabling it if we succeed in restarting the thread. 
Do this from a separate thread so as to not block any other code.
This will allow cgminer to continue even if one GPU hangs.
 2011-07-25 13:55:01 +10:00
Con Kolivas
a187fe1e7b Try to do every curses manipulation under the curses lock. 2011-07-25 13:00:44 +10:00
Con Kolivas
508c5c4b12 Detect when the primary pool is lagging and start queueing requests on backup pools if possible before needing to roll work. 2011-07-24 12:07:44 +10:00
Con Kolivas
afcff07012 Load balancing puts more into the current pool if there are disabled pools. Fix. 2011-07-24 11:25:23 +10:00
Con Kolivas
27c7d2a480 Disable a GPU device should the thread fail to init. 2011-07-24 10:59:19 +10:00
Con Kolivas
9a928e3407 Fix possible dereference on blank inputs during input_pool. 2011-07-24 08:55:16 +10:00
Con Kolivas
1a789a40c7 Defines missing would segfault on --help when no sse mining is built in. 2011-07-24 08:51:07 +10:00
Con Kolivas
fd473afedc Revert "Free up resources/stale compilers." 
This reverts commit b4960ec36b.

Didn't help and might have caused other issues.
 2011-07-24 08:44:14 +10:00
Con Kolivas
f3c5f55481 Only try to print the status of active devices. 2011-07-24 08:42:07 +10:00
Con Kolivas
020cf7d63f Build support in for all SSE if possible and only set the default according to machine capabilities. 2011-07-23 16:19:51 +10:00
Con Kolivas
039a5ea7cd No need to make leaveok changes win32 only. 2011-07-23 16:17:28 +10:00
Ycros
a150140eb7 Merge branch 'cgminer' of git://github.com/ckolivas/cgminer into cgminer 2011-07-23 16:00:49 +10:00
Con Kolivas
a9e1a25518 Make it possible to select the choice of kernel on the command line. 2011-07-23 15:15:46 +10:00
Con Kolivas
116a9dc025 Update phatk kernel to one with new parameters for slightly less overhead again. 
Make the queue kernel parameters call a function pointer to select phatk or poclbm.
 2011-07-23 14:17:25 +10:00
Con Kolivas
b5358483c3 Cannot print the status of threads that don't exist so just queue enough work for the number of mining threads to prevent crash with -Q N. 2011-07-23 09:37:22 +10:00
Ycros
e615b61f0a Merge branch 'cgminer' of git://github.com/ckolivas/cgminer into cgminer 2011-07-23 02:26:07 +10:00
Ycros
e04aee24d3 Win32: Fix for mangled output on the terminal on exit. 2011-07-23 02:25:54 +10:00
Con Kolivas
8d4fbc3258 Clear log window from consistent place. No need for locking since logging is disabled during input. 2011-07-23 00:45:03 +10:00
Con Kolivas
ba89a0a44f Unlocking error on retry. Locking unnecessary anyway so remove it. 2011-07-23 00:33:01 +10:00
Con Kolivas
f94ca32dcf Make sure intensity is carried over to thread count and is at least the minimum necessary to work. 2011-07-22 23:53:24 +10:00
Ycros
d37c3fe56b Win32 threading and longpoll keepalive fixes. 2011-07-22 23:43:26 +10:00
Con Kolivas
e83a32a4e2 Remove the mandatory work requirement at startup by testing for invalid work being passed which allows for work to be queued immediately. 
This also removes the requirement for resetting the timecodes at the start which caused huge over-estimates of hashing for a short period.
 2011-07-22 23:37:50 +10:00
Con Kolivas
61e555e44c Tell getwork how much of a work item we're likely to complete for future splitting up of work. 2011-07-22 22:22:14 +10:00
Con Kolivas
9e42d63cd6 With huge variation in GPU performance, allow intensity to go from -10 to +10. 2011-07-22 21:57:43 +10:00
Con Kolivas
61e5cc10e9 Extra refresh not required. 2011-07-22 20:12:32 +10:00
Con Kolivas
ae6eb1b0a3 Decrease testing log to info level. 2011-07-22 20:07:15 +10:00
Con Kolivas
ec86da70e1 Limit rolltime work generation to 10 iterations only. 2011-07-22 20:06:06 +10:00
Con Kolivas
6e9b6bf840 Implement pool removal. 2011-07-22 17:46:28 +10:00
Con Kolivas
532587eba4 Set priority correctly on multipools. 
Display priority and alive/dead information in display_pools.
 2011-07-22 17:23:57 +10:00
Con Kolivas
56defd6e0b Make it possible to enable/disable longpoll. 2011-07-22 17:02:29 +10:00
Con Kolivas
53529a842d Abstract out the longpoll start and explicitly restart it on pool change. 2011-07-22 16:51:38 +10:00
Con Kolivas
62c8a8c1e1 Allow scan settings to be modified at runtime. 2011-07-22 16:32:38 +10:00
Con Kolivas
a8c84da4c9 Allow log interval to be set in the menu. 2011-07-22 16:10:47 +10:00
Con Kolivas
2f976c7406 Make the input windows update immediately instead of needing a refresh. 2011-07-22 15:17:09 +10:00
Con Kolivas
0909facfaf Clean up the messy way the staging thread communicates with the longpoll thread to determine who found the block first. 2011-07-22 15:00:57 +10:00
Con Kolivas
0106c56797 Add a menu and separate out display options. 2011-07-22 14:29:48 +10:00
Con Kolivas
4bfa2809c3 Display pool information on the fly as well. 2011-07-22 14:07:50 +10:00
Con Kolivas
75bf36ff0e Allow the pool strategy to be modified on the fly. 2011-07-22 13:58:06 +10:00
Con Kolivas
cca6f49ef8 Abstract out active pools count. 2011-07-22 12:39:32 +10:00
Con Kolivas
31a8944564 Tidy. 2011-07-22 12:33:54 +10:00
Con Kolivas
ad53696f3f The longpoll blanking of the current_block data may not be happening before the work is converted and appears to be a detected block change. 
Blank the current block before submitting the work and stop passing the longpoll bool around.
 2011-07-22 12:17:44 +10:00
Con Kolivas
44bcc32234 Display current pool management strategy to enable changing it on the fly. 2011-07-22 12:14:24 +10:00
Con Kolivas
b534ad0aad Only internally test for block changes when the work matches the current pool to prevent interleaved block change timing on multipools. 2011-07-22 12:02:04 +10:00
Con Kolivas
b0a8f279f7 Implement the ability to live add, enable, disable, and switch to pools. 2011-07-22 11:46:26 +10:00
Con Kolivas
baddb82ad9 Do one last check of the work before submitting it. 2011-07-22 07:50:20 +10:00
Con Kolivas
20336ea15d Make input pool capable of bringing up pools while running. 2011-07-21 15:15:38 +10:00
Con Kolivas
7841486f83 Add a bool for explicit enabling/disabling of pools. 2011-07-21 14:41:12 +10:00
Con Kolivas
0bc9574628 Add pool option to input and display current pool status, pending code to allow live changes. 2011-07-21 14:29:33 +10:00
Con Kolivas
ec06940c21 Add a thread that takes keyboard input and allow for quit, silent, debug, verbose, normal, rpc protocol debugging and clear screen options. 2011-07-21 14:05:08 +10:00
Con Kolivas
b4f651f4ff Disable/enable echo & cbreak modes. 2011-07-21 13:26:18 +10:00
Con Kolivas
6fdbe01412 Remove the nil arguments check to allow starting without parameters. 2011-07-21 13:11:15 +10:00
Con Kolivas
9d60b107f1 Abstract out a curses input function and separate input pool function to allow for live adding of pools later. 2011-07-21 13:08:36 +10:00
Con Kolivas
365c90096c Make it possible to enter server credentials with curses input if none are specified on the command line. 2011-07-21 12:25:21 +10:00
Con Kolivas
2b7e5e58c8 Enable curses earlier and exit with message in main for messages to not be lost in curses windows. 2011-07-21 11:46:01 +10:00
Con Kolivas
4766463b78 Only set option to show devices and exit if built with opencl support. 2011-07-21 11:07:51 +10:00
Con Kolivas
f4f018b498 Don't try to stop/cancel threads that don't exist. 2011-07-21 10:15:17 +10:00
Con Kolivas
b4960ec36b Free up resources/stale compilers. 2011-07-21 09:48:06 +10:00
Con Kolivas
fa9e03f487 Implement pool rotation strategy. 2011-07-20 13:48:23 +10:00
Con Kolivas
521025aa75 Implement load balancing algorithm by rotating requests to each pool. 2011-07-20 13:35:55 +10:00
Con Kolivas
0ba06c69f9 Timeout on failed discarding of staged requests. 2011-07-20 13:15:52 +10:00
Con Kolivas
6305146bea Implement proper flagging of idle pools, test them with the watchdog thread, and failover correctly. 2011-07-20 13:07:41 +10:00
Con Kolivas
7c8919328c Move pool active test to own function. 2011-07-20 11:49:03 +10:00
Con Kolivas
40419f1a78 Allow multiple strategies to be set for multipool management. 2011-07-20 11:39:02 +10:00
Con Kolivas
d518f7cbfd Track pool number. 2011-07-20 11:27:21 +10:00
Con Kolivas
02e0e12529 Don't waste the work items queued on testing the pools at startup. 2011-07-20 10:07:39 +10:00
Con Kolivas
ced0e5ad81 Reinstate the mining thread watchdog restart. 
Add a getpoll bool into the thread information and don't restart threads stuck waiting on work.
Rename the idlenet bool for the pool for later use.
 2011-07-20 09:31:45 +10:00
Con Kolivas
0afab92cd4 Allow the user/pass userpass urls to be input in any order. 2011-07-19 23:16:30 +10:00
Con Kolivas
0d8b8793b5 Reset the queued count to allow more work to be queued for the new pool on pool switch. 2011-07-19 17:00:56 +10:00
Con Kolivas
012456f3b7 Display per pool summary at the end if multiple pools in use. Fine tune statistics and make localgen fail at 5 mins. 2011-07-19 14:33:52 +10:00
Con Kolivas
85bf965cda Force a mandatory work item on pool switch and determine what to do based on server supporting roll time or not. 2011-07-19 14:09:36 +10:00
Con Kolivas
f91a048ae7 Implement the actual switch logic which changes over after 5 minutes of local work generation. 2011-07-19 13:30:29 +10:00
Con Kolivas
81ff7fb3dc Explicitly probe each pool to see if work can be retrieved from it and what it supports. 2011-07-19 13:01:08 +10:00
Con Kolivas
913e120262 Test for rolltime and save it correctly when testing for longpoll. 2011-07-19 12:29:33 +10:00
Con Kolivas
0ce3df10d2 Store whether each server supports X-Roll-Ntime or not. 2011-07-19 11:45:58 +10:00
Con Kolivas
321c4798d4 Make longpoll switch servers should it not match the current pool. 2011-07-19 10:53:04 +10:00
Con Kolivas
529aa70c38 Set pool on work retrieved from longpoll. 2011-07-19 10:32:24 +10:00
Con Kolivas
048bea201f Set first localgen time to max. 2011-07-19 10:31:05 +10:00
Con Kolivas
ecda75946b Set and get the current pool under lock. 2011-07-19 10:19:59 +10:00
Con Kolivas
b8ba2fd44e Implement a per-pool mutex and use that for locking the internal flags. 2011-07-19 09:54:50 +10:00
Con Kolivas
fd10b993b0 Move add pool to somewhere clean and obvious. 2011-07-19 09:43:15 +10:00
Con Kolivas
7073493911 Merge branch 'cgminer' into pools 
Conflicts:
	main.c
 2011-07-19 01:46:16 +10:00
Con Kolivas
a46b5d1e0a Make it possible to pass multiple urls/users etc in preparation for multiple pool support but only use pool 0 for now. 2011-07-19 01:27:56 +10:00
Con Kolivas
19b80d6db3 Curl's global init can trample dynamically allocated data so do it before anything else. 2011-07-19 00:14:58 +10:00
Con Kolivas
961c43067b Abstract out the pool data to begin move to multiple pool support. 2011-07-19 00:09:45 +10:00
Con Kolivas
1d27c119b6 Don't let total_queued go below zero. 2011-07-18 22:02:10 +10:00
Con Kolivas
8220af8806 Avoid queueing extra work if there's work staged as well. 2011-07-18 20:22:16 +10:00
Con Kolivas
c3e569ed9b Copied the data to longpoll_block too early so the longpoll message will rarely be received. 
Submit longpoll's converted work after we've flushed requests since that will blank the current_block for stage_thread to see.
 2011-07-18 13:16:15 +10:00