Merge tag '4.1.271'

Author: Elbandi

AUTHORS.md

@@ -31,6 +31,7 @@ updated by many others.
 
 ## Testing, bug fixes, improvements
 
+* Hot-switching OpenCL kernel (N-Factor): Jan Berdajs <mrbrdo> 15bULC8snaKAMeFb3xBmmhbWj1xyTmBUfm
 * Gabriel Devenyi <gdevenyi>
 * Benjamin Herrenschmidt <ozbenh>
 * Joe4782 <Joe4782>

NEWS.md

@@ -2,16 +2,36 @@
 
 ## Version 4.2.0 - TBA
 
+* 
+
+
+## Version 4.1.271 - 12th April 2014
+
+* Allow setting algorithm per-pool and initial implementation of kernel
+  hot-swapping (by _mrbrdo_). Use options `pool-algorithm` (in config
+  file or in CLI) or `algorithm` (config-only).
+* NCurses UI [S][W] writes pool name and description to configuration.
+* Added algorithm name to `pools` API command (by _troky_).
+* NCurses UI asks for (optional) pool name, description and algorithm
+  when adding pool.
+* API command `addpool` allows both `url,user,pass` and
+  `url,user,pass,name,desc,algo`.
+
+
+## Version 4.1.242 - 7th April 2014
+
+* There are now two mailing lists (on SourceForge), see `README.md`.
 * Adaptive-N-factor algorithm support (by _Bufius_, _Zuikkis_ and
   _veox_). For details on choosing the algorithm, see
   `doc/configuration.md`.
-* Setting pool name with `poolname` is deprecated. Use `name` instead.
 * Allowed kernel names are no longer hard-coded. It is now possible to
   use any `.cl` file.
 * Configuration parameter `poolname` has been renamed to `name`.
+  `poolname` is deprecated and will be removed in a future version.
 * Multiple `--name` parsing should now work as expected (by _troky_).
-* `--coin` configuration parameter to specify a freeform pool
-  description (by _troky_).
+* `--description` configuration parameter to specify a freeform pool
+  description, and `--priority` to specify the pool's priority (by
+  _troky_).
 * Added new Algorithms for cpu coins
   nscrypt --algorithm nscrypt
   scrypt-jane --algorithm scrypt-jane

README.md

@@ -7,17 +7,19 @@ CPU coin algo's no longer use kernel option to set. Use algorithm instead. i.e.
 ## Introduction
 
 This is a multi-threaded multi-pool GPU miner with ATI GPU monitoring,
-(over)clocking and fanspeed support for scrypt-based coins. It is based on
-cgminer by Con Kolivas (ckolivas), which is in turn based on cpuminer by
-Jeff Garzik (jgarzik).
+(over)clocking and fanspeed support for scrypt-based cryptocurrency. It is
+based on cgminer by Con Kolivas (ckolivas), which is in turn based on
+cpuminer by Jeff Garzik (jgarzik).
 
 **releases**: https://github.com/veox/sgminer/releases
 
 **git tree**: https://github.com/veox/sgminer
 
-**issues**: https://github.com/veox/sgminer/issues
+**bugtracker**: https://github.com/veox/sgminer/issues
 
-**irc**: `#sgminer` on freenode
+**irc**: `#sgminer` and `#sgminer-dev` on freenode
+
+**mailing lists**: https://sourceforge.net/p/sgminer/mailman/
 
 License: GPLv3.  See `COPYING` for details.
 
@@ -69,6 +71,11 @@ sgminer-specific configuration options:
     --disable-adl           Override detection and disable building with adl
 	--disable-adl-checks
     --without-curses        Do not compile support for curses TUI
+    
+#### Debian Example
+
+    apt-get install libcurl4-openssl-dev pkg-config libtool libncurses5-dev
+AMD APP SDK and AMD ADL SDK must be downloaded from the amd websites.
 
 ### *nix build instructions
 

adl.c

@@ -121,7 +121,6 @@ static	ADL_OVERDRIVE6_POWERCONTROL_SET		ADL_Overdrive6_PowerControl_Set;
 #endif
 static int iNumberAdapters;
 static LPAdapterInfo lpInfo = NULL;
-static LPADLDisplayInfo lpAdlDisplayInfo = NULL;
 
 int set_fanspeed(int gpu, int iFanSpeed);
 static float __gpu_temp(struct gpu_adl *ga);
@@ -326,7 +325,6 @@ void init_adl(int nDevs)
 	struct gpu_adapters adapters[MAX_GPUDEVICES], vadapters[MAX_GPUDEVICES];
 	bool devs_match = true;
 	ADLBiosInfo BiosInfo;
-	int iNumDisplays;
 
 	applog(LOG_INFO, "Number of ADL devices: %d", nDevs);
 
@@ -361,7 +359,7 @@ void init_adl(int nDevs)
 		return;
 	}
 
-	applog(LOG_INFO, "Found %d ADL adapters", iNumberAdapters);
+	applog(LOG_INFO, "Found %d logical ADL adapters", iNumberAdapters);
 
 	/* Iterate over iNumberAdapters and find the lpAdapterID of real devices */
 	for (i = 0; i < iNumberAdapters; i++) {

adl.h

@@ -1,5 +1,6 @@
-#ifndef __ADL_H__
-#define __ADL_H__
+#ifndef ADL_H
+#define ADL_H
+
 #ifdef HAVE_ADL
 extern bool adl_active;
 extern bool opt_reorder;
@@ -19,10 +20,14 @@ bool gpu_stats(int gpu, float *temp, int *engineclock, int *memclock, float *vdd
 void change_gpusettings(int gpu);
 void gpu_autotune(int gpu, enum dev_enable *denable);
 void clear_adl(int nDevs);
+
 #else /* HAVE_ADL */
+
 #define adl_active (0)
 static inline void init_adl(__maybe_unused int nDevs) {}
 static inline void change_gpusettings(__maybe_unused int gpu) { }
 static inline void clear_adl(__maybe_unused int nDevs) {}
-#endif
-#endif
+
+#endif /* HAVE_ADL */
+
+#endif /* ADL_H */

algorithm.c

@@ -64,15 +64,15 @@ static algorithm_t algos[] = {
 	{ NULL, NULL, 0, 0, ALGO_SCRYPT, 0, 0, 0, 0, NULL}
 };
 
-void set_algorithm(algorithm_t** algo, const char* newname) {
+void set_algorithm(algorithm_t* algo, const char* newname) {
 	algorithm_t* a;
 	for (a = algos; a->name; a++) {
 		if (strcmp(a->name, newname) == 0) {
-			*algo = a;
+			*algo = *a;
 			break;
 		}
 	}
-	(*algo)->n = (1 << (*algo)->nfactor);
+	algo->n = (1 << algo->nfactor);
 }
 
 void set_algorithm_nfactor(algorithm_t* algo, const uint8_t nfactor) {
@@ -81,3 +81,8 @@ void set_algorithm_nfactor(algorithm_t* algo, const uint8_t nfactor) {
 
 	return;
 }
+
+bool cmp_algorithm(algorithm_t* algo1, algorithm_t* algo2) {
+    return (strcmp(algo1->name, algo2->name) == 0) &&
+          (algo1->nfactor == algo2->nfactor);
+}

algorithm.h

@@ -2,6 +2,7 @@
 #define ALGORITHM_H
 
 #include <inttypes.h>
+#include <stdbool.h>
 
 struct work;
 
@@ -39,9 +40,12 @@ typedef struct _algorithm_t {
 } algorithm_t;
 
 /* Set default parameters based on name. */
-void set_algorithm(algorithm_t** algo, const char* name);
+void set_algorithm(algorithm_t* algo, const char* name);
 
 /* Set to specific N factor. */
 void set_algorithm_nfactor(algorithm_t* algo, const uint8_t nfactor);
 
+/* Compare two algorithm parameters */
+bool cmp_algorithm(algorithm_t* algo1, algorithm_t* algo2);
+
 #endif /* ALGORITHM_H */

api.c

@@ -128,7 +128,7 @@ static const char GPUSEP = ',';
 #define JOIN_CMD "CMD="
 #define BETWEEN_JOIN SEPSTR
 
-static const char *APIVERSION = "3.1";
+static const char *APIVERSION = "3.2";
 static const char *DEAD = "Dead";
 static const char *SICK = "Sick";
 static const char *NOSTART = "NoStart";
@@ -2070,8 +2070,9 @@ static void poolstatus(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __m
 
 		root = api_add_int(root, "POOL", &i, false);
 		root = api_add_string(root, "Name", pool->name, false);
-		root = api_add_string(root, "Coin", pool->coin, false);
 		root = api_add_escape(root, "URL", pool->rpc_url, false);
+		root = api_add_string(root, "Algorithm", (char *)pool->algorithm.name, false);
+		root = api_add_string(root, "Description", pool->description, false);
 		root = api_add_string(root, "Status", status, false);
 		root = api_add_int(root, "Priority", &(pool->prio), false);
 		root = api_add_int(root, "Quota", &pool->quota, false);
@@ -2362,7 +2363,8 @@ static void copyadvanceafter(char ch, char **param, char **buf)
 	*(dst_b++) = '\0';
 }
 
-static bool pooldetails(char *param, char **url, char **user, char **pass)
+static bool pooldetails(char *param, char **url, char **user, char **pass,
+			char **name, char **desc, char **algo)
 {
 	char *ptr, *buf;
 
@@ -2371,24 +2373,31 @@ static bool pooldetails(char *param, char **url, char **user, char **pass)
 		quit(1, "Failed to malloc pooldetails buf");
 
 	*url = buf;
-
-	// copy url
 	copyadvanceafter(',', &param, &buf);
-
 	if (!(*param)) // missing user
 		goto exitsama;
 
 	*user = buf;
-
-	// copy user
 	copyadvanceafter(',', &param, &buf);
-
 	if (!*param) // missing pass
 		goto exitsama;
 
 	*pass = buf;
+	copyadvanceafter(',', &param, &buf);
+	if (!*param) // missing name (allowed)
+		return true;
 
-	// copy pass
+	*name = buf;
+	copyadvanceafter(',', &param, &buf);
+	if (!*param) // missing desc
+		goto exitsama;
+
+	*desc = buf;
+	copyadvanceafter(',', &param, &buf);
+	if (!*param) // missing algo
+		goto exitsama;
+
+	*algo = buf;
 	copyadvanceafter(',', &param, &buf);
 
 	return true;
@@ -2401,6 +2410,7 @@ static bool pooldetails(char *param, char **url, char **user, char **pass)
 static void addpool(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
 {
 	char *url, *user, *pass;
+	char *name = NULL, *desc = NULL, *algo = NULL;
 	struct pool *pool;
 	char *ptr;
 
@@ -2409,7 +2419,8 @@ static void addpool(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *
 		return;
 	}
 
-	if (!pooldetails(param, &url, &user, &pass)) {
+	if (!pooldetails(param, &url, &user, &pass,
+			 &name, &desc, &algo)) {
 		ptr = escape_string(param, isjson);
 		message(io_data, MSG_INVPDP, 0, ptr, isjson);
 		if (ptr != param)
@@ -2418,9 +2429,14 @@ static void addpool(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *
 		return;
 	}
 
+	/* If API client is old, it might not have provided all fields. */
+	if (name == NULL) name = strdup("");
+	if (desc == NULL) desc = strdup("");
+	if (algo == NULL) algo = strdup("scrypt");  // FIXME?
+
 	pool = add_pool();
 	detect_stratum(pool, url);
-	add_pool_details(pool, true, url, user, pass);
+	add_pool_details(pool, true, url, user, pass, name, desc, algo);
 
 	ptr = escape_string(url, isjson);
 	message(io_data, MSG_ADDPOOL, 0, ptr, isjson);
@@ -3165,7 +3181,7 @@ static void minecoin(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __may
 	message(io_data, MSG_MINECOIN, 0, NULL, isjson);
 	io_open = io_add(io_data, isjson ? COMSTR JSON_MINECOIN : _MINECOIN COMSTR);
 
-	root = api_add_const(root, "Hash Method", algorithm->name, false);
+	root = api_add_string(root, "Hash Method", (char *)get_devices(0)->algorithm.name, false);
 
 	cg_rlock(&ch_lock);
 	root = api_add_timeval(root, "Current Block Time", &block_timeval, true);
@@ -4682,7 +4698,7 @@ void api(int api_thr_id)
 	pthread_cleanup_pop(true);
 
 	free(apisock);
-	
+
 	if (opt_debug)
 		applog(LOG_DEBUG, "API: terminating due to: %s",
 				do_a_quit ? "QUIT" : (do_a_restart ? "RESTART" : (bye ? "BYE" : "UNKNOWN!")));

compat.h

@@ -1,5 +1,5 @@
-#ifndef __COMPAT_H__
-#define __COMPAT_H__
+#ifndef COMPAT_H
+#define COMPAT_H
 
 #ifdef WIN32
 #include "config.h"
@@ -88,4 +88,4 @@ typedef long suseconds_t;
 #define PTH(thr) ((thr)->pth)
 #endif /* WIN32 */
 
-#endif /* __COMPAT_H__ */
+#endif /* COMPAT_H */

configure.ac

@@ -2,7 +2,7 @@
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_define([v_maj], [4])
 m4_define([v_min], [1])
-m4_define([v_mic], [153])
+m4_define([v_mic], [271])
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_define([v_ver], [v_maj.v_min.v_mic])
 m4_define([lt_rev], m4_eval(v_maj + v_min))

doc/configuration.md

@@ -10,6 +10,9 @@
 Allows choosing between the few mining algorithms for incompatible
 cryptocurrencies.
 
+If specified in a pool section in the configuration file, sets the
+option for that pool only. Otherwise sets the default.
+
 *Argument:* string
 
 *Default:* `scrypt`
@@ -36,16 +39,30 @@ cryptocurrencies.
   without warning.
 
 
+### pool-algorithm
+
+Allows choosing the algorithm for a specific pool. See `algorithm`.
+
+
 ### nfactor
 
 Overrides the default scrypt parameter N, specified as the factor of 2
 (`N = 2^nfactor`).
 
+If specified in a pool section in the configuration file, sets the
+option for that pool only. Otherwise sets the default.
+
 *Argument:* whole number (>1).
 
 *Default:* depends on `algorithm`; otherwise `10`.
 
 
+### pool-nfactor
+
+Overrides the default scrypt parameter N for a specific pool.
+See `nfactor`.
+
+
 ## CLI-only options
 
 *TODO*

driver-gridseed.c

@@ -768,6 +768,8 @@ static bool gridseed_detect_one(libusb_device *dev, struct usb_find_devices *fou
 
 	gc3355_init(gridseed, info);
 
+	gridseed->algorithm = default_algorithm;
+
 	if (!add_cgpu(gridseed))
 		goto unshin;