Commit ce61b9b0604d9221756ade4b16a0395a0c81de18
2013-10-23T10:19:48
Merge branch 'master' of github.com:ckolivas/cgminer
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
diff --git a/api.c b/api.c
index 7ece861..3494f9e 100644
--- a/api.c
+++ b/api.c
@@ -136,7 +136,7 @@ static const char SEPARATOR = '|';
#define SEPSTR "|"
static const char GPUSEP = ',';
-static const char *APIVERSION = "1.31";
+static const char *APIVERSION = "1.32";
static const char *DEAD = "Dead";
#if defined(HAVE_OPENCL) || defined(HAVE_AN_FPGA) || defined(HAVE_AN_ASIC)
static const char *SICK = "Sick";
@@ -1998,6 +1998,7 @@ static void gpustatus(struct io_data *io_data, int gpu, bool isjson, bool precom
double rejp = cgpu->diff1 ?
(double)(cgpu->diff_rejected) / (double)(cgpu->diff1) : 0;
root = api_add_percent(root, "Device Rejected%", &rejp, false);
+ root = api_add_elapsed(root, "Device Elapsed", &(total_secs), true); // GPUs don't hotplug
root = print_data(root, buf, isjson, precom);
io_add(io_data, buf);
@@ -2077,6 +2078,7 @@ static void ascstatus(struct io_data *io_data, int asc, bool isjson, bool precom
double rejp = cgpu->diff1 ?
(double)(cgpu->diff_rejected) / (double)(cgpu->diff1) : 0;
root = api_add_percent(root, "Device Rejected%", &rejp, false);
+ root = api_add_elapsed(root, "Device Elapsed", &(dev_runtime), false);
root = print_data(root, buf, isjson, precom);
io_add(io_data, buf);
@@ -2163,6 +2165,7 @@ static void pgastatus(struct io_data *io_data, int pga, bool isjson, bool precom
double rejp = cgpu->diff1 ?
(double)(cgpu->diff_rejected) / (double)(cgpu->diff1) : 0;
root = api_add_percent(root, "Device Rejected%", &rejp, false);
+ root = api_add_elapsed(root, "Device Elapsed", &(dev_runtime), false);
root = print_data(root, buf, isjson, precom);
io_add(io_data, buf);
diff --git a/miner.php b/miner.php
index a43d9af..fd42271 100644
--- a/miner.php
+++ b/miner.php
@@ -2385,7 +2385,7 @@ function ss($a, $b)
$la = strlen($a);
$lb = strlen($b);
if ($la != $lb)
- return $la - $lb;
+ return $lb - $la;
return strcmp($a, $b);
}
#