1
0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-09 06:18:06 +00:00
Commit Graph

302 Commits

Author SHA1 Message Date
Noel Maersk
f5709910fb api: Bugfix, bump version to 4.1.271, initialise name/desc/algo in addpool() so checks for NULL work.
Otherwise API "addpool|a,b,c" command segfaults (access uninitialised
memory address).
2014-04-12 19:28:23 +03:00
Noel Maersk
5409ffc2a4 api: check if name/desc/algo are NULL and fill with defaults if so.
Defaults should probably be specified elsewhere.
There should be a constructor for stuff like this.
This shit is really bringing me down.
2014-04-11 15:27:58 +03:00
Noel Maersk
9aaff8ccf5 api: bump version, but allow name/desc/algo to be missing when adding pool details.
This will have unintended consequences, since API clients are sure to
send pool details without name/desc/algo. pooldetails() will allow them
to do that, and add_pool_details() will fill the pool structure with
NULLs.
2014-04-11 15:17:42 +03:00
Noel Maersk
3c3a58475e ui+api: ask for pool name/description/algorithm when adding pool from NCurses/API.
Closes #116.

This is trivial and shouldn't be so hard: it required modifying
functions in both sgminer.c (for NCurses stuff) and api.c. There is
much code repetition, since the NCurses interface is hard-coded in.
Removing it would simplify things greatly.
2014-04-11 15:06:36 +03:00
troky
2a087a7dae Added algorithm name to 'pools' API command. 2014-04-11 10:58:05 +02:00
Noel Maersk
0793c96074 Merge remote-tracking branch 'mrbrdo/poolalgo' into poolalgo
Conflicts (resolved):
	ocl.h
	sgminer.c
2014-04-07 22:05:33 +03:00
Noel Maersk
b6218e20c1 config: rename --pool-priority to --priority, --coin to --description.
There are now get_current_pool() and current_pool(), which is confusing.
Moved them closer together, so it's at least obvious.
2014-04-07 21:14:17 +03:00
Jan Berdajs
c2131df6aa add support for setting algorithm/nfactor for each pool separately, and fix bugged OpenCL thread cleanup (thread shutdown) 2014-03-31 21:05:20 +02:00
troky
bcb78ed91b Added --coin pool parameter. 2014-03-26 11:10:41 +01:00
Noel Maersk
aa471a2dfd api: remove unused SCRYPTSTR.
Gets rid of compiler warning.
2014-03-23 15:14:18 +02:00
troky
9414592539 Added pool name to API "pools" command 2014-03-20 20:54:52 +01:00
Noel Maersk
87801c2578 opencl: rename cgpu_info->kname to cgpu_info->kernelname. 2014-03-17 21:57:00 +02:00
unknown
6b0b424c0a Fixed API timeval formatting again. Use of snprintf() causes problems in MSVS. 2014-03-15 12:45:40 +01:00
Noel Maersk
8079d054d6 Merge branch 'nfactor'
Conflicts (resolved):
	Makefile.am
	winbuild/sgminer.vcxproj.filters
2014-03-14 17:46:54 +02:00
unknown
0e37fc24b0 Added algorrithm name to "coin" API command. Changed default algo name to "scrypt". 2014-03-13 23:02:51 +01:00
unknown
25242861c7 API: Fixed timeval struct formatting . 2014-03-12 09:32:00 +01:00
Noel Maersk
ae23d25086 api: proper type casting for MSVS support.
Closes https://github.com/veox/sgminer/issues/113
2014-02-24 13:54:06 +02:00
Noel Maersk
44aed3570e Merge branch 'build-msvs2010-upd' into build-msvs2010-merge
Test in separate branch before merging into master.

Conflicts (resolved):
	api.c
	util.c
2014-02-22 17:05:07 +02:00
Jim Jagielski
88c7720caf These may not be longs (eg: OSX)... fo a safe cast to ensure. 2014-02-16 15:05:44 +02:00
Kano
ae837a762f API allow multiple commands/replies in one request 2014-02-16 15:00:32 +02:00
Con Kolivas
90cc93c6cc Add the ability to display a hexadecimal 32 bit unsigned integer to the API. 2014-02-16 14:42:30 +02:00
Con Kolivas
c31de2601b Store when the last getwork was retrieved and display it in the API summary. 2014-02-16 14:14:40 +02:00
ckolivas
a58ef1b8c7 Provide a helper function for determining dev runtime and use it in the hashmeters used. 2014-02-16 14:09:51 +02:00
Kano
faf63ec036 Modify thread naming to make them easier to identify 2014-02-16 13:56:14 +02:00
Kano
301daae6f4 api.c 2014 2014-02-16 13:51:58 +02:00
Kano
b6c6ec5c83 api add data type AVG float 3 decimal 2014-02-16 13:49:26 +02:00
Kano
83ea44af5d api.c set the actual version number to 3.0
Conflicts resolved:
	api.c
2014-02-16 13:48:31 +02:00
Kano
83176cb52a API V3.0 unlimited socket reply size 2014-02-16 13:47:47 +02:00
Noel Maersk
4e08eb41ef api: bump API version number to indicate changes that happened after 4.0.0. 2014-02-11 23:39:03 +02:00
Markus Peloquin
bf8e37ce19 Support building in cygwin.
Revised the compiler platform macros. Building goes like
$ AMDAPPSDKROOT= CPPFLAGS=-I/usr/include/ncurses ./configure
2014-02-07 22:31:40 -08:00
Noel Maersk
dff7876b7a Merge branch 'master' into build-msvs2010-upd 2014-02-07 21:45:26 +02:00
Noel Maersk
0e8ec8d060 pools: Allow disabling pool even if it's the last one enabled.
Pool state machine is incomplete, and enabled_pools is not increased if
pool state is not explicitly set to "enabled" in config. However,
there is no reason why the user should not be allowed to disable
all pools.

enabled_pools is a bookkeeping variable, and bookkeeping is cumbersome.
Rather than trying to fix this regression, get rid of another place
where enabled_pools is used.

Closes https://github.com/veox/sgminer/issues/75
2014-02-05 16:28:27 +02:00
Noel Maersk
b97a641ed9 Merge branch 'master' into build-msvs2010-upd
Conflicts (resolved):
	sgminer.c
2014-02-01 00:25:56 +02:00
Perry Huang
8bd980dbbd Add API_KHS endpoint.
Fix multiplying before double cast.

Add endpoint to response.

Fix API response function.

Fix var name.

Add KHS to API summary.
2014-01-31 02:57:23 -06:00
Sanjin Trošelj
84eefc74cd VS2010 build: prepare API.
Cherry-picked by veox.

Previous variable 'new' was badly named, but troky's 'n' was too cryptic.
Therefore renamed to 'newsize'.
2014-01-27 22:26:37 +02:00
Noel Maersk
048c82b9b2 pools: rename 'pool->enabled' to 'pool->state'. 2014-01-26 20:02:00 +02:00
Wolf
39b9945c11 Changed API reporting of MH/s for added precision. 2014-01-17 11:55:13 +02:00
Noel Maersk
50066cf3c7 misc: Replace all remaining instances of 'cgminer' with 'sgminer'.
sed again.
2014-01-15 16:36:48 +02:00
Noel Maersk
5b977125fa misc: Replace many (but not all) instances of 'cgminer' with 'sgminer'.
Just ran a `sed -i 's/cgminer/sgminer/'` on several files.
2014-01-15 15:36:19 +02:00
Kano
65518d3712 api.c no decref if not json 2014-01-15 14:32:31 +02:00
Tim Bateman
0a187bdd41 Fixed one byte stack overflow in mcast recvfrom.
The actual overflow happens when enforcing the NULL termination shortly
after the recvfrom.
2014-01-15 13:43:10 +02:00
Con Kolivas
65d9136dd5 Fix json parsing in api.c 2014-01-15 13:39:51 +02:00
Con Kolivas
39b7bc26cb Silence irrelevant warning. 2014-01-15 13:34:31 +02:00
Con Kolivas
ebeb710375 Decrement json references in api.c to not leak memory.
The json_val in api.c is a borrowed reference, not a new one so don't decref it.
2014-01-15 13:22:28 +02:00
Kano
89000ffb1a api.c trylock() add missing locklock 2014-01-15 12:48:11 +02:00
Maksym Borodin
d976abe12d api.c: Release apisock on error in api() 2014-01-15 12:45:51 +02:00
Maksym Borodin
7383e19a9d api.c: Release io_data->ptr when releasing io_data in io_free() 2014-01-15 12:45:29 +02:00
Noel Maersk
83e52dfe78 api: remove references to FPGAs and ASICs. 2014-01-11 23:01:02 +02:00
Noel Maersk
199cb10e18 HAVE_OPENCL is mandatory, remove checks form code an build system. 2013-12-05 20:49:18 +02:00
Noel Maersk
323af83fdb Remove define-clauses for USE_SCRYPT. 2013-11-24 19:52:14 +02:00