Skip to content

Commit

Permalink
bab - use 'bad' instead of 'dead' as per the screen B:
Browse files Browse the repository at this point in the history
  • Loading branch information
@kanoi
kanoi committed Feb 20, 2014
1 parent 1b64d38 commit 006f97c
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions driver-bab.c
View file
Expand Up @@ -324,7 +324,7 @@ static double chip_speed_ranges[BAB_CHIP_SPEEDS - 1] =
{ 0.0, 0.8, 1.6, 2.2, 2.8 };
// Greater than the last one above means it's the last speed
static char *chip_speed_names[BAB_CHIP_SPEEDS] =
{ "Dead", "V.Slow", "Slow", "OK", "Good", "Fast" };
{ "Bad", "V.Slow", "Slow", "OK", "Good", "Fast" };

/*
* This is required to do chip tuning
Expand Down Expand Up @@ -464,7 +464,7 @@ struct bab_info {
uint32_t work_count[BAB_MAXCHIPS];
struct timeval last_tune[BAB_MAXCHIPS];
uint8_t bad_fast[BAB_MAXCHIPS];
bool dead_msg[BAB_MAXCHIPS];
bool bad_msg[BAB_MAXCHIPS];
#endif
uint64_t work_unrolled;
uint64_t work_rolled;
Expand Down Expand Up @@ -1797,7 +1797,7 @@ static void process_history(struct cgpu_info *babcgpu, int chip, struct timeval
chip_fast = babinfo->chip_fast[chip];

/*
* If dead then step it down and remember the speed
* If bad then step it down and remember the speed
* TODO: does a speed change reset the chip? Or is there a reset?
*/
if (good_nonces == 0) {
Expand All @@ -1815,12 +1815,12 @@ static void process_history(struct cgpu_info *babcgpu, int chip, struct timeval
* Permanently DEAD since we're already at the minumum speed
* but only getting bad nonces
*/
if (babinfo->dead_msg[chip] == false) {
applog(LOG_WARNING, "%s%d: Chip %d DEAD - at min speed %d",
if (babinfo->bad_msg[chip] == false) {
applog(LOG_WARNING, "%s%d: Chip %d BAD - at min speed %d",
babcgpu->drv->name, babcgpu->device_id,
chip, (int)chip_fast);

babinfo->dead_msg[chip] = true;
babinfo->bad_msg[chip] = true;
}
}
goto tune_over;
Expand All @@ -1829,12 +1829,12 @@ static void process_history(struct cgpu_info *babcgpu, int chip, struct timeval
/*
* It 'was' permanently DEAD but a good nonce came back!
*/
if (babinfo->dead_msg[chip]) {
if (babinfo->bad_msg[chip]) {
applog(LOG_WARNING, "%s%d: Chip %d REVIVED - at speed %d",
babcgpu->drv->name, babcgpu->device_id,
chip, (int)chip_fast);

babinfo->dead_msg[chip] = false;
babinfo->bad_msg[chip] = false;
}

/*
Expand Down Expand Up @@ -2415,7 +2415,7 @@ static struct api_data *bab_api_stats(struct cgpu_info *babcgpu)
char buf[32];
int spi_work, chip_work, sp, chip, bank, chip_off, board, last_board;
int i, to, j, k;
bool dead;
bool bad;
struct timeval now;
double elapsed, ghs;
float ghs_sum, his_ghs_tot;
Expand Down Expand Up @@ -2800,7 +2800,7 @@ static struct api_data *bab_api_stats(struct cgpu_info *babcgpu)
chip = babinfo->bank_first_chip[bank];
to = babinfo->bank_last_chip[bank];
for (; chip <= to; chip += BAB_BOARDCHIPS) {
dead = true;
bad = true;
for (k = chip; (k <= to) && (k < (chip+BAB_BOARDCHIPS)); k++) {
if (history_elapsed[k] > 0) {
double num = history_good[k];
Expand All @@ -2813,11 +2813,11 @@ static struct api_data *bab_api_stats(struct cgpu_info *babcgpu)
ghs = 0;

if (ghs > 0.0) {
dead = false;
bad = false;
break;
}
}
if (dead) {
if (bad) {
board = (int)((float)(chip - babinfo->bank_first_chip[bank]) /
BAB_BOARDCHIPS) + 1;
snprintf(buf, sizeof(buf),
Expand All @@ -2831,15 +2831,15 @@ static struct api_data *bab_api_stats(struct cgpu_info *babcgpu)
}
}
}
root = api_add_string(root, "History Dead Boards", data[0] ? data : "None", true);
root = api_add_string(root, "History Bad Boards", data[0] ? data : "None", true);

data[0] = '\0';
for (bank = i; bank <= j; bank++) {
if (babinfo->bank_first_chip[bank] >= 0) {
to = babinfo->bank_first_chip[bank];
chip = babinfo->bank_last_chip[bank];
for (; chip >= to; chip--) {
dead = true;
bad = true;
if (history_elapsed[chip] > 0) {
double num = history_good[chip];
// exclude the first nonce?
Expand All @@ -2855,15 +2855,15 @@ static struct api_data *bab_api_stats(struct cgpu_info *babcgpu)
}
/*
* The output here is: a/b+c/d
* a/b is the SPI/board that starts the Dead Chain
* a/b is the SPI/board that starts the Bad Chain
* c is the number of boards after a
* d is the total number of chips in the Dead Chain
* A Dead Chain is a continous set of dead chips that
* d is the total number of chips in the Bad Chain
* A Bad Chain is a continous set of bad chips that
* finish at the end of an SPI chain of boards
* This might be caused by the first board, or the cables attached
* to the first board, in the Dead Chain i.e. a/b
* to the first board, in the Bad Chain i.e. a/b
* If c is zero, it's just the last board, so it's the same as any
* other board having dead chips
* other board having bad chips
*/
if (chip < babinfo->bank_last_chip[bank]) {
board = (int)((float)(chip - babinfo->bank_first_chip[bank]) /
Expand All @@ -2883,7 +2883,7 @@ static struct api_data *bab_api_stats(struct cgpu_info *babcgpu)
}
}
}
root = api_add_string(root, "History Dead Chains", data[0] ? data : "None", true);
root = api_add_string(root, "History Bad Chains", data[0] ? data : "None", true);

root = api_add_int(root, "Disabled Chips", &(babinfo->total_disabled), true);

Expand Down

0 comments on commit 006f97c

Please sign in to comment.