Commit 0d4edbe9c1b4a1c8ea89d298acc20e8766ecbadf
2013-08-31T13:41:37
logging - applogsiz() for large messages
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 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187
diff --git a/driver-bflsc.c b/driver-bflsc.c
index 3045794..37e717c 100644
--- a/driver-bflsc.c
+++ b/driver-bflsc.c
@@ -617,7 +617,8 @@ static bool getinfo(struct cgpu_info *bflsc, int dev)
*lf = '\0';
if (!res || count != 1) {
tmp = str_text(items[i]);
- applog(LOG_WARNING, "%s detect (%s) invalid details line: '%s' %d",
+ applogsiz(LOG_WARNING, BFLSC_APPLOGSIZ,
+ "%s detect (%s) invalid details line: '%s' %d",
bflsc->drv->dname, bflsc->device_path, tmp, count);
free(tmp);
dev_error(bflsc, REASON_DEV_COMMS_ERROR);
@@ -631,8 +632,9 @@ static bool getinfo(struct cgpu_info *bflsc, int dev)
sc_dev.engines = atoi(fields[0]);
if (sc_dev.engines < 1) {
tmp = str_text(items[i]);
- applog(LOG_WARNING, "%s detect (%s) invalid engine count: '%s'",
- bflsc->drv->dname, bflsc->device_path, tmp);
+ applogsiz(LOG_WARNING, BFLSC_APPLOGSIZ,
+ "%s detect (%s) invalid engine count: '%s'",
+ bflsc->drv->dname, bflsc->device_path, tmp);
free(tmp);
goto mata;
}
@@ -645,8 +647,9 @@ static bool getinfo(struct cgpu_info *bflsc, int dev)
sc_info->sc_count = atoi(fields[0]);
if (sc_info->sc_count < 1 || sc_info->sc_count > 30) {
tmp = str_text(items[i]);
- applog(LOG_WARNING, "%s detect (%s) invalid s-link count: '%s'",
- bflsc->drv->dname, bflsc->device_path, tmp);
+ applogsiz(LOG_WARNING, BFLSC_APPLOGSIZ,
+ "%s detect (%s) invalid s-link count: '%s'",
+ bflsc->drv->dname, bflsc->device_path, tmp);
free(tmp);
goto mata;
}
@@ -1211,7 +1214,8 @@ static void process_nonces(struct cgpu_info *bflsc, int dev, char *xlink, char *
if (count < sc_info->que_fld_min) {
tmp = str_text(data);
- applog(LOG_INFO, "%s%i:%s work returned too small (%d,%s)",
+ applogsiz(LOG_INFO, BFLSC_APPLOGSIZ,
+ "%s%i:%s work returned too small (%d,%s)",
bflsc->drv->name, bflsc->device_id, xlink, count, tmp);
free(tmp);
inc_hw_errors(bflsc->thr[0]);
@@ -1219,7 +1223,7 @@ static void process_nonces(struct cgpu_info *bflsc, int dev, char *xlink, char *
}
if (count > sc_info->que_fld_max) {
- applog(LOG_INFO, "%s%i:%s work returned too large (%d) processing %d anyway",
+ applogsiz(LOG_INFO, "%s%i:%s work returned too large (%d) processing %d anyway",
bflsc->drv->name, bflsc->device_id, xlink, count, sc_info->que_fld_max);
count = sc_info->que_fld_max;
inc_hw_errors(bflsc->thr[0]);
@@ -1228,8 +1232,10 @@ static void process_nonces(struct cgpu_info *bflsc, int dev, char *xlink, char *
num = atoi(fields[sc_info->que_noncecount]);
if (num != count - sc_info->que_fld_min) {
tmp = str_text(data);
- applog(LOG_INFO, "%s%i:%s incorrect data count (%d) will use %d instead from (%s)",
- bflsc->drv->name, bflsc->device_id, xlink, num, count - sc_info->que_fld_max, tmp);
+ applogsiz(LOG_INFO, BFLSC_APPLOGSIZ,
+ "%s%i:%s incorrect data count (%d) will use %d instead from (%s)",
+ bflsc->drv->name, bflsc->device_id, xlink, num,
+ count - sc_info->que_fld_max, tmp);
free(tmp);
inc_hw_errors(bflsc->thr[0]);
}
@@ -1260,8 +1266,9 @@ static void process_nonces(struct cgpu_info *bflsc, int dev, char *xlink, char *
for (i = sc_info->que_fld_min; i < count; i++) {
if (strlen(fields[i]) != 8) {
tmp = str_text(data);
- applog(LOG_INFO, "%s%i:%s invalid nonce (%s) will try to process anyway",
- bflsc->drv->name, bflsc->device_id, xlink, tmp);
+ applogsiz(LOG_INFO, BFLSC_APPLOGSIZ,
+ "%s%i:%s invalid nonce (%s) will try to process anyway",
+ bflsc->drv->name, bflsc->device_id, xlink, tmp);
free(tmp);
}
@@ -1312,16 +1319,18 @@ static int process_results(struct cgpu_info *bflsc, int dev, char *pbuf, int *no
free(buf);
if (!res || lines < 1) {
tmp = str_text(pbuf);
- applog(LOG_ERR, "%s%i:%s empty result (%s) ignored",
- bflsc->drv->name, bflsc->device_id, xlink, tmp);
+ applogsiz(LOG_ERR, BFLSC_APPLOGSIZ,
+ "%s%i:%s empty result (%s) ignored",
+ bflsc->drv->name, bflsc->device_id, xlink, tmp);
free(tmp);
goto arigatou;
}
if (lines < QUE_RES_LINES_MIN) {
tmp = str_text(pbuf);
- applog(LOG_ERR, "%s%i:%s result of %d too small (%s) ignored",
- bflsc->drv->name, bflsc->device_id, xlink, lines, tmp);
+ applogsiz(LOG_ERR, BFLSC_APPLOGSIZ,
+ "%s%i:%s result of %d too small (%s) ignored",
+ bflsc->drv->name, bflsc->device_id, xlink, lines, tmp);
free(tmp);
goto arigatou;
}
@@ -1330,16 +1339,18 @@ static int process_results(struct cgpu_info *bflsc, int dev, char *pbuf, int *no
if (count < 1) {
tmp = str_text(pbuf);
tmp2 = str_text(items[1]);
- applog(LOG_ERR, "%s%i:%s empty result count (%s) in (%s) ignoring",
- bflsc->drv->name, bflsc->device_id, xlink, tmp2, tmp);
+ applogsiz(LOG_ERR, BFLSC_APPLOGSIZ,
+ "%s%i:%s empty result count (%s) in (%s) ignoring",
+ bflsc->drv->name, bflsc->device_id, xlink, tmp2, tmp);
free(tmp2);
free(tmp);
goto arigatou;
} else if (count != 1) {
tmp = str_text(pbuf);
tmp2 = str_text(items[1]);
- applog(LOG_ERR, "%s%i:%s incorrect result count %d (%s) in (%s) will try anyway",
- bflsc->drv->name, bflsc->device_id, xlink, count, tmp2, tmp);
+ applogsiz(LOG_ERR, BFLSC_APPLOGSIZ,
+ "%s%i:%s incorrect result count %d (%s) in (%s) will try anyway",
+ bflsc->drv->name, bflsc->device_id, xlink, count, tmp2, tmp);
free(tmp2);
free(tmp);
}
@@ -1352,8 +1363,9 @@ static int process_results(struct cgpu_info *bflsc, int dev, char *pbuf, int *no
tmp = str_text(pbuf);
tmp2 = str_text(items[0]);
- applog(LOG_ERR, "%s%i:%s incorrect result count %d (%s) will try %d (%s)",
- bflsc->drv->name, bflsc->device_id, xlink, i, tmp2, que, tmp);
+ applogsiz(LOG_ERR, BFLSC_APPLOGSIZ,
+ "%s%i:%s incorrect result count %d (%s) will try %d (%s)",
+ bflsc->drv->name, bflsc->device_id, xlink, i, tmp2, que, tmp);
free(tmp2);
free(tmp);
@@ -1366,8 +1378,9 @@ static int process_results(struct cgpu_info *bflsc, int dev, char *pbuf, int *no
if (likely(res))
process_nonces(bflsc, dev, &(xlink[0]), items[i], count, fields, nonces);
else
- applog(LOG_ERR, "%s%i:%s failed to process nonce %s",
- bflsc->drv->name, bflsc->device_id, xlink, items[i]);
+ applogsiz(LOG_ERR, BFLSC_APPLOGSIZ,
+ "%s%i:%s failed to process nonce %s",
+ bflsc->drv->name, bflsc->device_id, xlink, items[i]);
freebreakdown(&count, &firstname, &fields);
sc_info->not_first_work = true;
}
diff --git a/driver-bflsc.h b/driver-bflsc.h
index 7107c0e..e6617cb 100644
--- a/driver-bflsc.h
+++ b/driver-bflsc.h
@@ -46,6 +46,9 @@ enum driver_version {
*/
#define BFLSC_BUFSIZ (0x1000)
+// Should be big enough
+#define BFLSC_APPLOGSIZ (0x2000)
+
#define BFLSC_INFO_TIMEOUT 999
#define BFLSC_DI_FIRMWARE "FIRMWARE"
diff --git a/logging.h b/logging.h
index fa2a747..2956452 100644
--- a/logging.h
+++ b/logging.h
@@ -42,6 +42,16 @@ extern void _applog(int prio, const char *str);
} \
} while (0)
+#define applogsiz(prio, _SIZ, fmt, ...) do { \
+ if (opt_debug || prio != LOG_DEBUG) { \
+ if (use_syslog || opt_log_output || prio <= opt_log_level) { \
+ char tmp42[_SIZ]; \
+ snprintf(tmp42, sizeof(tmp42), fmt, ##__VA_ARGS__); \
+ _applog(prio, tmp42); \
+ } \
+ } \
+} while (0)
+
#define quit(status, fmt, ...) do { \
if (fmt) { \
char tmp42[LOGBUFSIZ]; \