Commit a58933dc09cd5e3e47b591e583282a637ff43a42
2012-12-11T15:43:24
api use a dynamic io buffer, truncated before it reaches the current ~64k limit
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 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098
diff --git a/api.c b/api.c
index ac1713c..bfd7f69 100644
--- a/api.c
+++ b/api.c
@@ -11,6 +11,7 @@
* this simplifies handling multiple other device code being included
* depending on compile options
*/
+#define _MEMORY_DEBUG_MASTER 1
#include "config.h"
@@ -34,8 +35,10 @@
// Big enough for largest API request
// though a PC with 100s of PGAs/CPUs may exceed the size ...
-// Current code assumes it can socket send this size also
-#define MYBUFSIZ 65432 // TODO: intercept before it's exceeded
+// data is truncated at the end of the last record that fits
+// but still closed correctly for JSON
+// Current code assumes it can socket send this size + JSON_CLOSE + JSON_END
+#define SOCKBUFSIZ 65432
// BUFSIZ varies on Windows and Linux
#define TMPBUFSIZ 8192
@@ -118,8 +121,6 @@ char *WSAErrorMsg(void) {
return &(WSAbuf[0]);
}
#endif
-static char *io_buffer = NULL;
-static char *msg_buffer = NULL;
static SOCKETTYPE sock = INVSOCK;
static const char *UNAVAILABLE = " - API will not be available";
@@ -127,11 +128,12 @@ static const char *INVAPIGROUPS = "Invalid --api-groups parameter";
static const char *BLANK = "";
static const char *COMMA = ",";
+#define COMSTR ","
static const char SEPARATOR = '|';
#define SEPSTR "|"
static const char GPUSEP = ',';
-static const char *APIVERSION = "1.21";
+static const char *APIVERSION = "1.22";
static const char *DEAD = "Dead";
#if defined(HAVE_OPENCL) || defined(HAVE_AN_FPGA)
static const char *SICK = "Sick";
@@ -235,6 +237,8 @@ static const char ISJSON = '{';
#define JSON2 "\":["
#define JSON3 "]"
#define JSON4 ",\"id\":1"
+// If anyone cares, id=0 for truncated output
+#define JSON4_TRUNCATED ",\"id\":0"
#define JSON5 "}"
#define JSON_START JSON0
@@ -269,6 +273,7 @@ static const char ISJSON = '{';
#define JSON_SETCONFIG JSON1 _SETCONFIG JSON2
#define JSON_USBSTATS JSON1 _USBSTATS JSON2
#define JSON_END JSON4 JSON5
+#define JSON_END_TRUNCATED JSON4_TRUNCATED JSON5
static const char *JSON_COMMAND = "command";
static const char *JSON_PARAMETER = "parameter";
@@ -595,6 +600,132 @@ extern struct device_api ztex_api;
extern struct device_api modminer_api;
#endif
+struct io_data {
+ size_t siz;
+ char *ptr;
+ char *cur;
+ bool sock;
+ bool full;
+ bool close;
+};
+
+struct io_list {
+ struct io_data *io_data;
+ struct io_list *prev;
+ struct io_list *next;
+};
+
+static struct io_list *io_head = NULL;
+
+#define io_new(init) _io_new(init, false)
+#define sock_io_new() _io_new(SOCKBUFSIZ, true)
+
+static void io_reinit(struct io_data *io_data)
+{
+ io_data->cur = io_data->ptr;
+ *(io_data->ptr) = '\0';
+ io_data->full = false;
+ io_data->close = false;
+}
+
+static struct io_data *_io_new(size_t initial, bool socket_buf)
+{
+ struct io_data *io_data;
+ struct io_list *io_list;
+
+ io_data = malloc(sizeof(*io_data));
+ io_data->ptr = malloc(initial);
+ io_data->siz = initial;
+ io_data->sock = socket_buf;
+ io_reinit(io_data);
+
+ io_list = malloc(sizeof(*io_list));
+
+ io_list->io_data = io_data;
+
+ if (io_head) {
+ io_list->next = io_head;
+ io_list->prev = io_head->prev;
+ io_list->next->prev = io_list;
+ io_list->prev->next = io_list;
+ } else {
+ io_list->prev = io_list;
+ io_list->next = io_list;
+ io_head = io_list;
+ }
+
+ return io_data;
+}
+
+static bool io_add(struct io_data *io_data, char *buf)
+{
+ size_t len, dif, tot;
+
+ if (io_data->full)
+ return false;
+
+ len = strlen(buf);
+ dif = io_data->cur - io_data->ptr;
+ tot = len + 1 + dif;
+
+ if (tot > io_data->siz) {
+ size_t new = io_data->siz * 2;
+
+ if (new < tot)
+ new = tot * 2;
+
+ if (io_data->sock) {
+ if (new > SOCKBUFSIZ) {
+ if (tot > SOCKBUFSIZ) {
+ io_data->full = true;
+ return false;
+ }
+
+ new = SOCKBUFSIZ;
+ }
+ }
+
+ io_data->ptr = realloc(io_data->ptr, new);
+ io_data->cur = io_data->ptr + dif;
+ io_data->siz = new;
+ }
+
+ memcpy(io_data->cur, buf, len + 1);
+ io_data->cur += len;
+
+ return true;
+}
+
+static bool io_put(struct io_data *io_data, char *buf)
+{
+ io_reinit(io_data);
+ return io_add(io_data, buf);
+}
+
+static void io_close(struct io_data *io_data)
+{
+ io_data->close = true;
+}
+
+static void io_free()
+{
+ struct io_list *io_list, *io_next;
+
+ if (io_head) {
+ io_list = io_head;
+ do {
+ io_next = io_list->next;
+
+ free(io_list->io_data);
+ free(io_list);
+
+ io_list = io_next;
+ } while (io_list != io_head);
+
+ io_head = NULL;
+ }
+}
+
// This is only called when expected to be needed (rarely)
// i.e. strings outside of the codes control (input from the user)
static char *escape_string(char *str, bool isjson)
@@ -879,13 +1010,20 @@ struct api_data *api_add_diff(struct api_data *root, char *name, double *data, b
return api_add_data_full(root, name, API_DIFF, (void *)data, copy_data);
}
-static struct api_data *print_data(struct api_data *root, char *buf, bool isjson)
+static struct api_data *print_data(struct api_data *root, char *buf, bool isjson, bool precom)
{
struct api_data *tmp;
bool first = true;
char *original, *escape;
char *quote;
+ *buf = '\0';
+
+ if (precom) {
+ *(buf++) = *COMMA;
+ *buf = '\0';
+ }
+
if (isjson) {
strcpy(buf, JSON0);
buf = strchr(buf, '\0');
@@ -1051,12 +1189,12 @@ static int pgadevice(int pgaid)
// All replies (except BYE and RESTART) start with a message
// thus for JSON, message() inserts JSON_START at the front
// and send_result() adds JSON_END at the end
-static char *message(int messageid, int paramid, char *param2, bool isjson)
+static void message(struct io_data *io_data, int messageid, int paramid, char *param2, bool isjson)
{
struct api_data *root = NULL;
char buf[TMPBUFSIZ];
+ char buf2[TMPBUFSIZ];
char severity[2];
- char *ptr;
#ifdef HAVE_AN_FPGA
int pga;
#endif
@@ -1065,12 +1203,10 @@ static char *message(int messageid, int paramid, char *param2, bool isjson)
#endif
int i;
- if (!isjson)
- msg_buffer[0] = '\0';
- else
- strcpy(msg_buffer, JSON_START JSON_STATUS);
+ io_reinit(io_data);
- ptr = strchr(msg_buffer, '\0');
+ if (isjson)
+ io_put(io_data, JSON_START JSON_STATUS);
for (i = 0; codes[i].severity != SEVERITY_FAIL; i++) {
if (codes[i].code == messageid) {
@@ -1176,10 +1312,11 @@ static char *message(int messageid, int paramid, char *param2, bool isjson)
root = api_add_escape(root, "Msg", buf, false);
root = api_add_escape(root, "Description", opt_api_description, false);
- root = print_data(root, ptr, isjson);
+ root = print_data(root, buf2, isjson, false);
+ io_add(io_data, buf2);
if (isjson)
- strcat(ptr, JSON_CLOSE);
- return msg_buffer;
+ io_add(io_data, JSON_CLOSE);
+ return;
}
}
@@ -1191,35 +1328,35 @@ static char *message(int messageid, int paramid, char *param2, bool isjson)
root = api_add_escape(root, "Msg", buf, false);
root = api_add_escape(root, "Description", opt_api_description, false);
- root = print_data(root, ptr, isjson);
+ root = print_data(root, buf2, isjson, false);
+ io_add(io_data, buf2);
if (isjson)
- strcat(ptr, JSON_CLOSE);
- return msg_buffer;
+ io_add(io_data, JSON_CLOSE);
}
-static void apiversion(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
+static void apiversion(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
{
struct api_data *root = NULL;
char buf[TMPBUFSIZ];
+ bool io_open;
- sprintf(io_buffer, isjson
- ? "%s," JSON_VERSION
- : "%s" _VERSION ",",
- message(MSG_VERSION, 0, NULL, isjson));
+ message(io_data, MSG_VERSION, 0, NULL, isjson);
+ io_open = io_add(io_data, isjson ? COMSTR JSON_VERSION : _VERSION COMSTR);
root = api_add_string(root, "CGMiner", VERSION, false);
root = api_add_const(root, "API", APIVERSION, false);
- root = print_data(root, buf, isjson);
- if (isjson)
- strcat(buf, JSON_CLOSE);
- strcat(io_buffer, buf);
+ root = print_data(root, buf, isjson, false);
+ io_add(io_data, buf);
+ if (isjson && io_open)
+ io_close(io_data);
}
-static void minerconfig(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
+static void minerconfig(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
{
struct api_data *root = NULL;
char buf[TMPBUFSIZ];
+ bool io_open;
int gpucount = 0;
int pgacount = 0;
int cpucount = 0;
@@ -1250,10 +1387,8 @@ static void minerconfig(__maybe_unused SOCKETTYPE c, __maybe_unused char *param,
cpucount = opt_n_threads > 0 ? num_processors : 0;
#endif
- sprintf(io_buffer, isjson
- ? "%s," JSON_MINECONFIG
- : "%s" _MINECONFIG ",",
- message(MSG_MINECONFIG, 0, NULL, isjson));
+ message(io_data, MSG_MINECONFIG, 0, NULL, isjson);
+ io_open = io_add(io_data, isjson ? COMSTR JSON_MINECONFIG : _MINECONFIG COMSTR);
root = api_add_int(root, "GPU Count", &gpucount, false);
root = api_add_int(root, "PGA Count", &pgacount, false);
@@ -1270,10 +1405,10 @@ static void minerconfig(__maybe_unused SOCKETTYPE c, __maybe_unused char *param,
root = api_add_int(root, "Queue", &opt_queue, false);
root = api_add_int(root, "Expiry", &opt_expiry, false);
- root = print_data(root, buf, isjson);
- if (isjson)
- strcat(buf, JSON_CLOSE);
- strcat(io_buffer, buf);
+ root = print_data(root, buf, isjson, false);
+ io_add(io_data, buf);
+ if (isjson && io_open)
+ io_close(io_data);
}
#if defined(HAVE_OPENCL) || defined(HAVE_AN_FPGA)
@@ -1297,7 +1432,7 @@ static const char *status2str(enum alive status)
#endif
#ifdef HAVE_OPENCL
-static void gpustatus(int gpu, bool isjson)
+static void gpustatus(struct io_data *io_data, int gpu, bool isjson, bool precom)
{
struct api_data *root = NULL;
char intensity[20];
@@ -1360,14 +1495,14 @@ static void gpustatus(int gpu, bool isjson)
root = api_add_diff(root, "Difficulty Rejected", &(cgpu->diff_rejected), false);
root = api_add_diff(root, "Last Share Difficulty", &(cgpu->last_share_diff), false);
- root = print_data(root, buf, isjson);
- strcat(io_buffer, buf);
+ root = print_data(root, buf, isjson, precom);
+ io_add(io_data, buf);
}
}
#endif
#ifdef HAVE_AN_FPGA
-static void pgastatus(int pga, bool isjson)
+static void pgastatus(struct io_data *io_data, int pga, bool isjson, bool precom)
{
struct api_data *root = NULL;
char buf[TMPBUFSIZ];
@@ -1428,14 +1563,14 @@ static void pgastatus(int pga, bool isjson)
root = api_add_diff(root, "Difficulty Rejected", &(cgpu->diff_rejected), false);
root = api_add_diff(root, "Last Share Difficulty", &(cgpu->last_share_diff), false);
- root = print_data(root, buf, isjson);
- strcat(io_buffer, buf);
+ root = print_data(root, buf, isjson, precom);
+ io_add(io_data, buf);
}
}
#endif
#ifdef WANT_CPUMINE
-static void cpustatus(int cpu, bool isjson)
+static void cpustatus(struct io_data *io_data, int cpu, bool isjson, bool precom)
{
struct api_data *root = NULL;
char buf[TMPBUFSIZ];
@@ -1464,14 +1599,15 @@ static void cpustatus(int cpu, bool isjson)
root = api_add_diff(root, "Difficulty Rejected", &(cgpu->diff_rejected), false);
root = api_add_diff(root, "Last Share Difficulty", &(cgpu->last_share_diff), false);
- root = print_data(root, buf, isjson);
- strcat(io_buffer, buf);
+ root = print_data(root, buf, isjson, precom);
+ io_add(io_data, buf);
}
}
#endif
-static void devstatus(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
+static void devstatus(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
{
+ bool io_open = false;
int devcount = 0;
int numgpu = 0;
int numpga = 0;
@@ -1486,23 +1622,18 @@ static void devstatus(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, b
#endif
if (numgpu == 0 && opt_n_threads == 0 && numpga == 0) {
- strcpy(io_buffer, message(MSG_NODEVS, 0, NULL, isjson));
+ message(io_data, MSG_NODEVS, 0, NULL, isjson);
return;
}
- strcpy(io_buffer, message(MSG_DEVS, 0, NULL, isjson));
- if (isjson) {
- strcat(io_buffer, COMMA);
- strcat(io_buffer, JSON_DEVS);
- }
+ message(io_data, MSG_DEVS, 0, NULL, isjson);
+ if (isjson)
+ io_open = io_add(io_data, COMSTR JSON_DEVS);
#ifdef HAVE_OPENCL
for (i = 0; i < nDevs; i++) {
- if (isjson && devcount > 0)
- strcat(io_buffer, COMMA);
-
- gpustatus(i, isjson);
+ gpustatus(io_data, i, isjson, isjson && devcount > 0);
devcount++;
}
@@ -1510,10 +1641,7 @@ static void devstatus(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, b
#ifdef HAVE_AN_FPGA
if (numpga > 0) {
for (i = 0; i < numpga; i++) {
- if (isjson && devcount > 0)
- strcat(io_buffer, COMMA);
-
- pgastatus(i, isjson);
+ pgastatus(io_data, i, isjson, isjson && devcount > 0);
devcount++;
}
@@ -1523,90 +1651,86 @@ static void devstatus(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, b
#ifdef WANT_CPUMINE
if (opt_n_threads > 0) {
for (i = 0; i < num_processors; i++) {
- if (isjson && devcount > 0)
- strcat(io_buffer, COMMA);
-
- cpustatus(i, isjson);
+ cpustatus(io_data, i, isjson, isjson && devcount > 0);
devcount++;
}
}
#endif
- if (isjson)
- strcat(io_buffer, JSON_CLOSE);
+ if (isjson && io_open)
+ io_close(io_data);
}
#ifdef HAVE_OPENCL
-static void gpudev(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
+static void gpudev(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
{
+ bool io_open = false;
int id;
if (nDevs == 0) {
- strcpy(io_buffer, message(MSG_GPUNON, 0, NULL, isjson));
+ message(io_data, MSG_GPUNON, 0, NULL, isjson);
return;
}
if (param == NULL || *param == '\0') {
- strcpy(io_buffer, message(MSG_MISID, 0, NULL, isjson));
+ message(io_data, MSG_MISID, 0, NULL, isjson);
return;
}
id = atoi(param);
if (id < 0 || id >= nDevs) {
- strcpy(io_buffer, message(MSG_INVGPU, id, NULL, isjson));
+ message(io_data, MSG_INVGPU, id, NULL, isjson);
return;
}
- strcpy(io_buffer, message(MSG_GPUDEV, id, NULL, isjson));
+ message(io_data, MSG_GPUDEV, id, NULL, isjson);
- if (isjson) {
- strcat(io_buffer, COMMA);
- strcat(io_buffer, JSON_GPU);
- }
+ if (isjson)
+ io_open = io_add(io_data, COMSTR JSON_GPU);
- gpustatus(id, isjson);
+ gpustatus(io_data, id, isjson, false);
- if (isjson)
- strcat(io_buffer, JSON_CLOSE);
+ if (isjson && io_open)
+ io_close(io_data);
}
#endif
+
#ifdef HAVE_AN_FPGA
-static void pgadev(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
+static void pgadev(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
{
+ bool io_open = false;
int numpga = numpgas();
int id;
if (numpga == 0) {
- strcpy(io_buffer, message(MSG_PGANON, 0, NULL, isjson));
+ message(io_data, MSG_PGANON, 0, NULL, isjson);
return;
}
if (param == NULL || *param == '\0') {
- strcpy(io_buffer, message(MSG_MISID, 0, NULL, isjson));
+ message(io_data, MSG_MISID, 0, NULL, isjson);
return;
}
id = atoi(param);
if (id < 0 || id >= numpga) {
- strcpy(io_buffer, message(MSG_INVPGA, id, NULL, isjson));
+ message(io_data, MSG_INVPGA, id, NULL, isjson);
return;
}
- strcpy(io_buffer, message(MSG_PGADEV, id, NULL, isjson));
+ message(io_data, MSG_PGADEV, id, NULL, isjson);
- if (isjson) {
- strcat(io_buffer, COMMA);
- strcat(io_buffer, JSON_PGA);
- }
+ if (isjson)
+ io_open = io_add(io_data, COMSTR JSON_PGA);
- pgastatus(id, isjson);
+ pgastatus(io_data, id, isjson, false);
- if (isjson)
- strcat(io_buffer, JSON_CLOSE);
+ if (isjson && io_open)
+ io_close(io_data);
}
-static void pgaenable(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
+static void pgaenable(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
{
int numpga = numpgas();
struct thr_info *thr;
@@ -1615,37 +1739,37 @@ static void pgaenable(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __m
int i;
if (numpga == 0) {
- strcpy(io_buffer, message(MSG_PGANON, 0, NULL, isjson));
+ message(io_data, MSG_PGANON, 0, NULL, isjson);
return;
}
if (param == NULL || *param == '\0') {
- strcpy(io_buffer, message(MSG_MISID, 0, NULL, isjson));
+ message(io_data, MSG_MISID, 0, NULL, isjson);
return;
}
id = atoi(param);
if (id < 0 || id >= numpga) {
- strcpy(io_buffer, message(MSG_INVPGA, id, NULL, isjson));
+ message(io_data, MSG_INVPGA, id, NULL, isjson);
return;
}
int dev = pgadevice(id);
if (dev < 0) { // Should never happen
- strcpy(io_buffer, message(MSG_INVPGA, id, NULL, isjson));
+ message(io_data, MSG_INVPGA, id, NULL, isjson);
return;
}
struct cgpu_info *cgpu = devices[dev];
if (cgpu->deven != DEV_DISABLED) {
- strcpy(io_buffer, message(MSG_PGALRENA, id, NULL, isjson));
+ message(io_data, MSG_PGALRENA, id, NULL, isjson);
return;
}
#if 0 /* A DISABLED device wont change status FIXME: should disabling make it WELL? */
if (cgpu->status != LIFE_WELL) {
- strcpy(io_buffer, message(MSG_PGAUNW, id, NULL, isjson));
+ message(io_data, MSG_PGAUNW, id, NULL, isjson);
return;
}
#endif
@@ -1659,72 +1783,72 @@ static void pgaenable(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __m
}
}
- strcpy(io_buffer, message(MSG_PGAENA, id, NULL, isjson));
+ message(io_data, MSG_PGAENA, id, NULL, isjson);
}
-static void pgadisable(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
+static void pgadisable(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
{
int numpga = numpgas();
int id;
if (numpga == 0) {
- strcpy(io_buffer, message(MSG_PGANON, 0, NULL, isjson));
+ message(io_data, MSG_PGANON, 0, NULL, isjson);
return;
}
if (param == NULL || *param == '\0') {
- strcpy(io_buffer, message(MSG_MISID, 0, NULL, isjson));
+ message(io_data, MSG_MISID, 0, NULL, isjson);
return;
}
id = atoi(param);
if (id < 0 || id >= numpga) {
- strcpy(io_buffer, message(MSG_INVPGA, id, NULL, isjson));
+ message(io_data, MSG_INVPGA, id, NULL, isjson);
return;
}
int dev = pgadevice(id);
if (dev < 0) { // Should never happen
- strcpy(io_buffer, message(MSG_INVPGA, id, NULL, isjson));
+ message(io_data, MSG_INVPGA, id, NULL, isjson);
return;
}
struct cgpu_info *cgpu = devices[dev];
if (cgpu->deven == DEV_DISABLED) {
- strcpy(io_buffer, message(MSG_PGALRDIS, id, NULL, isjson));
+ message(io_data, MSG_PGALRDIS, id, NULL, isjson);
return;
}
cgpu->deven = DEV_DISABLED;
- strcpy(io_buffer, message(MSG_PGADIS, id, NULL, isjson));
+ message(io_data, MSG_PGADIS, id, NULL, isjson);
}
-static void pgaidentify(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
+static void pgaidentify(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
{
int numpga = numpgas();
int id;
if (numpga == 0) {
- strcpy(io_buffer, message(MSG_PGANON, 0, NULL, isjson));
+ message(io_data, MSG_PGANON, 0, NULL, isjson);
return;
}
if (param == NULL || *param == '\0') {
- strcpy(io_buffer, message(MSG_MISID, 0, NULL, isjson));
+ message(io_data, MSG_MISID, 0, NULL, isjson);
return;
}
id = atoi(param);
if (id < 0 || id >= numpga) {
- strcpy(io_buffer, message(MSG_INVPGA, id, NULL, isjson));
+ message(io_data, MSG_INVPGA, id, NULL, isjson);
return;
}
int dev = pgadevice(id);
if (dev < 0) { // Should never happen
- strcpy(io_buffer, message(MSG_INVPGA, id, NULL, isjson));
+ message(io_data, MSG_INVPGA, id, NULL, isjson);
return;
}
@@ -1732,67 +1856,65 @@ static void pgaidentify(__maybe_unused SOCKETTYPE c, char *param, bool isjson, _
struct device_api *api = cgpu->api;
if (!api->identify_device)
- strcpy(io_buffer, message(MSG_PGANOID, id, NULL, isjson));
+ message(io_data, MSG_PGANOID, id, NULL, isjson);
else {
api->identify_device(cgpu);
- strcpy(io_buffer, message(MSG_PGAIDENT, id, NULL, isjson));
+ message(io_data, MSG_PGAIDENT, id, NULL, isjson);
}
}
#endif
#ifdef WANT_CPUMINE
-static void cpudev(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
+static void cpudev(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
{
+ bool io_open = false;
int id;
if (opt_n_threads == 0) {
- strcpy(io_buffer, message(MSG_CPUNON, 0, NULL, isjson));
+ message(io_data, MSG_CPUNON, 0, NULL, isjson);
return;
}
if (param == NULL || *param == '\0') {
- strcpy(io_buffer, message(MSG_MISID, 0, NULL, isjson));
+ message(io_data, MSG_MISID, 0, NULL, isjson);
return;
}
id = atoi(param);
if (id < 0 || id >= num_processors) {
- strcpy(io_buffer, message(MSG_INVCPU, id, NULL, isjson));
+ message(io_data, MSG_INVCPU, id, NULL, isjson);
return;
}
- strcpy(io_buffer, message(MSG_CPUDEV, id, NULL, isjson));
+ message(io_data, MSG_CPUDEV, id, NULL, isjson);
- if (isjson) {
- strcat(io_buffer, COMMA);
- strcat(io_buffer, JSON_CPU);
- }
+ if (isjson)
+ io_open = io_add(io_data, COMSTR JSON_CPU);
- cpustatus(id, isjson);
+ cpustatus(io_data, id, isjson, false);
- if (isjson)
- strcat(io_buffer, JSON_CLOSE);
+ if (isjson && io_open)
+ io_close(io_data);
}
#endif
-static void poolstatus(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
+static void poolstatus(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
{
struct api_data *root = NULL;
char buf[TMPBUFSIZ];
+ bool io_open = false;
char *status, *lp;
int i;
if (total_pools == 0) {
- strcpy(io_buffer, message(MSG_NOPOOL, 0, NULL, isjson));
+ message(io_data, MSG_NOPOOL, 0, NULL, isjson);
return;
}
- strcpy(io_buffer, message(MSG_POOL, 0, NULL, isjson));
+ message(io_data, MSG_POOL, 0, NULL, isjson);
- if (isjson) {
- strcat(io_buffer, COMMA);
- strcat(io_buffer, JSON_POOLS);
- }
+ if (isjson)
+ io_open = io_add(io_data, COMSTR JSON_POOLS);
for (i = 0; i < total_pools; i++) {
struct pool *pool = pools[i];
@@ -1856,21 +1978,19 @@ static void poolstatus(__maybe_unused SOCKETTYPE c, __maybe_unused char *param,
else
root = api_add_const(root, "Stratum URL", BLANK, false);
- if (isjson && (i > 0))
- strcat(io_buffer, COMMA);
-
- root = print_data(root, buf, isjson);
- strcat(io_buffer, buf);
+ root = print_data(root, buf, isjson, isjson && (i > 0));
+ io_add(io_data, buf);
}
- if (isjson)
- strcat(io_buffer, JSON_CLOSE);
+ if (isjson && io_open)
+ io_close(io_data);
}
-static void summary(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
+static void summary(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
{
struct api_data *root = NULL;
char buf[TMPBUFSIZ];
+ bool io_open;
double utility, mhs, work_utility;
#ifdef WANT_CPUMINE
@@ -1879,6 +1999,9 @@ static void summary(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, boo
algo = (char *)NULLSTR;
#endif
+ message(io_data, MSG_SUMM, 0, NULL, isjson);
+ io_open = io_add(io_data, isjson ? COMSTR JSON_SUMMARY : _SUMMARY COMSTR);
+
// stop hashmeter() changing some while copying
mutex_lock(&hash_lock);
@@ -1886,11 +2009,6 @@ static void summary(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, boo
mhs = total_mhashes_done / total_secs;
work_utility = total_diff1 / ( total_secs ? total_secs : 1 ) * 60;
- sprintf(io_buffer, isjson
- ? "%s," JSON_SUMMARY
- : "%s" _SUMMARY ",",
- message(MSG_SUMM, 0, NULL, isjson));
-
root = api_add_elapsed(root, "Elapsed", &(total_secs), true);
#ifdef WANT_CPUMINE
root = api_add_string(root, "Algorithm", algo, false);
@@ -1917,13 +2035,14 @@ static void summary(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, boo
mutex_unlock(&hash_lock);
- root = print_data(root, buf, isjson);
- if (isjson)
- strcat(buf, JSON_CLOSE);
- strcat(io_buffer, buf);
+ root = print_data(root, buf, isjson, false);
+ io_add(io_data, buf);
+ if (isjson && io_open)
+ io_close(io_data);
}
+
#ifdef HAVE_OPENCL
-static void gpuenable(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
+static void gpuenable(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
{
struct thr_info *thr;
int gpu;
@@ -1931,23 +2050,23 @@ static void gpuenable(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __m
int i;
if (gpu_threads == 0) {
- strcpy(io_buffer, message(MSG_GPUNON, 0, NULL, isjson));
+ message(io_data, MSG_GPUNON, 0, NULL, isjson);
return;
}
if (param == NULL || *param == '\0') {
- strcpy(io_buffer, message(MSG_MISID, 0, NULL, isjson));
+ message(io_data, MSG_MISID, 0, NULL, isjson);
return;
}
id = atoi(param);
if (id < 0 || id >= nDevs) {
- strcpy(io_buffer, message(MSG_INVGPU, id, NULL, isjson));
+ message(io_data, MSG_INVGPU, id, NULL, isjson);
return;
}
if (gpus[id].deven != DEV_DISABLED) {
- strcpy(io_buffer, message(MSG_ALRENA, id, NULL, isjson));
+ message(io_data, MSG_ALRENA, id, NULL, isjson);
return;
}
@@ -1956,7 +2075,7 @@ static void gpuenable(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __m
if (gpu == id) {
thr = &thr_info[i];
if (thr->cgpu->status != LIFE_WELL) {
- strcpy(io_buffer, message(MSG_GPUMRE, id, NULL, isjson));
+ message(io_data, MSG_GPUMRE, id, NULL, isjson);
return;
}
@@ -1966,151 +2085,149 @@ static void gpuenable(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __m
}
}
- strcpy(io_buffer, message(MSG_GPUREN, id, NULL, isjson));
+ message(io_data, MSG_GPUREN, id, NULL, isjson);
}
-static void gpudisable(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
+static void gpudisable(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
{
int id;
if (nDevs == 0) {
- strcpy(io_buffer, message(MSG_GPUNON, 0, NULL, isjson));
+ message(io_data, MSG_GPUNON, 0, NULL, isjson);
return;
}
if (param == NULL || *param == '\0') {
- strcpy(io_buffer, message(MSG_MISID, 0, NULL, isjson));
+ message(io_data, MSG_MISID, 0, NULL, isjson);
return;
}
id = atoi(param);
if (id < 0 || id >= nDevs) {
- strcpy(io_buffer, message(MSG_INVGPU, id, NULL, isjson));
+ message(io_data, MSG_INVGPU, id, NULL, isjson);
return;
}
if (gpus[id].deven == DEV_DISABLED) {
- strcpy(io_buffer, message(MSG_ALRDIS, id, NULL, isjson));
+ message(io_data, MSG_ALRDIS, id, NULL, isjson);
return;
}
gpus[id].deven = DEV_DISABLED;
- strcpy(io_buffer, message(MSG_GPUDIS, id, NULL, isjson));
+ message(io_data, MSG_GPUDIS, id, NULL, isjson);
}
-static void gpurestart(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
+static void gpurestart(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
{
int id;
if (nDevs == 0) {
- strcpy(io_buffer, message(MSG_GPUNON, 0, NULL, isjson));
+ message(io_data, MSG_GPUNON, 0, NULL, isjson);
return;
}
if (param == NULL || *param == '\0') {
- strcpy(io_buffer, message(MSG_MISID, 0, NULL, isjson));
+ message(io_data, MSG_MISID, 0, NULL, isjson);
return;
}
id = atoi(param);
if (id < 0 || id >= nDevs) {
- strcpy(io_buffer, message(MSG_INVGPU, id, NULL, isjson));
+ message(io_data, MSG_INVGPU, id, NULL, isjson);
return;
}
reinit_device(&gpus[id]);
- strcpy(io_buffer, message(MSG_GPUREI, id, NULL, isjson));
+ message(io_data, MSG_GPUREI, id, NULL, isjson);
}
#endif
-static void gpucount(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
+
+static void gpucount(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
{
struct api_data *root = NULL;
char buf[TMPBUFSIZ];
+ bool io_open;
int numgpu = 0;
#ifdef HAVE_OPENCL
numgpu = nDevs;
#endif
- sprintf(io_buffer, isjson
- ? "%s," JSON_GPUS
- : "%s" _GPUS ",",
- message(MSG_NUMGPU, 0, NULL, isjson));
+ message(io_data, MSG_NUMGPU, 0, NULL, isjson);
+ io_open = io_add(io_data, isjson ? COMSTR JSON_GPUS : _GPUS COMSTR);
root = api_add_int(root, "Count", &numgpu, false);
- root = print_data(root, buf, isjson);
- if (isjson)
- strcat(buf, JSON_CLOSE);
- strcat(io_buffer, buf);
+ root = print_data(root, buf, isjson, false);
+ io_add(io_data, buf);
+ if (isjson && io_open)
+ io_close(io_data);
}
-static void pgacount(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
+static void pgacount(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
{
struct api_data *root = NULL;
char buf[TMPBUFSIZ];
+ bool io_open;
int count = 0;
#ifdef HAVE_AN_FPGA
count = numpgas();
#endif
- sprintf(io_buffer, isjson
- ? "%s," JSON_PGAS
- : "%s" _PGAS ",",
- message(MSG_NUMPGA, 0, NULL, isjson));
+ message(io_data, MSG_NUMPGA, 0, NULL, isjson);
+ io_open = io_add(io_data, isjson ? COMSTR JSON_PGAS : _PGAS COMSTR);
root = api_add_int(root, "Count", &count, false);
- root = print_data(root, buf, isjson);
- if (isjson)
- strcat(buf, JSON_CLOSE);
- strcat(io_buffer, buf);
+ root = print_data(root, buf, isjson, false);
+ io_add(io_data, buf);
+ if (isjson && io_open)
+ io_close(io_data);
}
-static void cpucount(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
+static void cpucount(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
{
struct api_data *root = NULL;
char buf[TMPBUFSIZ];
+ bool io_open;
int count = 0;
#ifdef WANT_CPUMINE
count = opt_n_threads > 0 ? num_processors : 0;
#endif
- sprintf(io_buffer, isjson
- ? "%s," JSON_CPUS
- : "%s" _CPUS ",",
- message(MSG_NUMCPU, 0, NULL, isjson));
+ message(io_data, MSG_NUMCPU, 0, NULL, isjson);
+ io_open = io_add(io_data, isjson ? COMSTR JSON_CPUS : _CPUS COMSTR);
root = api_add_int(root, "Count", &count, false);
- root = print_data(root, buf, isjson);
- if (isjson)
- strcat(buf, JSON_CLOSE);
- strcat(io_buffer, buf);
+ root = print_data(root, buf, isjson, false);
+ io_add(io_data, buf);
+ if (isjson && io_open)
+ io_close(io_data);
}
-static void switchpool(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
+static void switchpool(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
{
struct pool *pool;
int id;
if (total_pools == 0) {
- strcpy(io_buffer, message(MSG_NOPOOL, 0, NULL, isjson));
+ message(io_data, MSG_NOPOOL, 0, NULL, isjson);
return;
}
if (param == NULL || *param == '\0') {
- strcpy(io_buffer, message(MSG_MISPID, 0, NULL, isjson));
+ message(io_data, MSG_MISPID, 0, NULL, isjson);
return;
}
id = atoi(param);
if (id < 0 || id >= total_pools) {
- strcpy(io_buffer, message(MSG_INVPID, id, NULL, isjson));
+ message(io_data, MSG_INVPID, id, NULL, isjson);
return;
}
@@ -2118,7 +2235,7 @@ static void switchpool(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __
pool->enabled = POOL_ENABLED;
switch_pools(pool);
- strcpy(io_buffer, message(MSG_SWITCHP, id, NULL, isjson));
+ message(io_data, MSG_SWITCHP, id, NULL, isjson);
}
static void copyadvanceafter(char ch, char **param, char **buf)
@@ -2174,20 +2291,20 @@ exitsama:
return false;
}
-static void addpool(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
+static void addpool(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
{
char *url, *user, *pass;
struct pool *pool;
char *ptr;
if (param == NULL || *param == '\0') {
- strcpy(io_buffer, message(MSG_MISPDP, 0, NULL, isjson));
+ message(io_data, MSG_MISPDP, 0, NULL, isjson);
return;
}
if (!pooldetails(param, &url, &user, &pass)) {
ptr = escape_string(param, isjson);
- strcpy(io_buffer, message(MSG_INVPDP, 0, ptr, isjson));
+ message(io_data, MSG_INVPDP, 0, ptr, isjson);
if (ptr != param)
free(ptr);
ptr = NULL;
@@ -2199,36 +2316,36 @@ static void addpool(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __may
add_pool_details(pool, true, url, user, pass);
ptr = escape_string(url, isjson);
- strcpy(io_buffer, message(MSG_ADDPOOL, 0, ptr, isjson));
+ message(io_data, MSG_ADDPOOL, 0, ptr, isjson);
if (ptr != url)
free(ptr);
ptr = NULL;
}
-static void enablepool(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
+static void enablepool(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
{
struct pool *pool;
int id;
if (total_pools == 0) {
- strcpy(io_buffer, message(MSG_NOPOOL, 0, NULL, isjson));
+ message(io_data, MSG_NOPOOL, 0, NULL, isjson);
return;
}
if (param == NULL || *param == '\0') {
- strcpy(io_buffer, message(MSG_MISPID, 0, NULL, isjson));
+ message(io_data, MSG_MISPID, 0, NULL, isjson);
return;
}
id = atoi(param);
if (id < 0 || id >= total_pools) {
- strcpy(io_buffer, message(MSG_INVPID, id, NULL, isjson));
+ message(io_data, MSG_INVPID, id, NULL, isjson);
return;
}
pool = pools[id];
if (pool->enabled == POOL_ENABLED) {
- strcpy(io_buffer, message(MSG_ALRENAP, id, NULL, isjson));
+ message(io_data, MSG_ALRENAP, id, NULL, isjson);
return;
}
@@ -2236,10 +2353,10 @@ static void enablepool(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __
if (pool->prio < current_pool()->prio)
switch_pools(pool);
- strcpy(io_buffer, message(MSG_ENAPOOL, id, NULL, isjson));
+ message(io_data, MSG_ENAPOOL, id, NULL, isjson);
}
-static void poolpriority(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
+static void poolpriority(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
{
char *ptr, *next;
int i, pr, prio = 0;
@@ -2249,12 +2366,12 @@ static void poolpriority(__maybe_unused SOCKETTYPE c, char *param, bool isjson,
// just copying total_pools here wont solve that
if (total_pools == 0) {
- strcpy(io_buffer, message(MSG_NOPOOL, 0, NULL, isjson));
+ message(io_data, MSG_NOPOOL, 0, NULL, isjson);
return;
}
if (param == NULL || *param == '\0') {
- strcpy(io_buffer, message(MSG_MISPID, 0, NULL, isjson));
+ message(io_data, MSG_MISPID, 0, NULL, isjson);
return;
}
@@ -2272,12 +2389,12 @@ static void poolpriority(__maybe_unused SOCKETTYPE c, char *param, bool isjson,
i = atoi(ptr);
if (i < 0 || i >= total_pools) {
- strcpy(io_buffer, message(MSG_INVPID, i, NULL, isjson));
+ message(io_data, MSG_INVPID, i, NULL, isjson);
return;
}
if (pools_changed[i]) {
- strcpy(io_buffer, message(MSG_DUPPID, i, NULL, isjson));
+ message(io_data, MSG_DUPPID, i, NULL, isjson);
return;
}
@@ -2304,38 +2421,38 @@ static void poolpriority(__maybe_unused SOCKETTYPE c, char *param, bool isjson,
if (current_pool()->prio)
switch_pools(NULL);
- strcpy(io_buffer, message(MSG_POOLPRIO, 0, NULL, isjson));
+ message(io_data, MSG_POOLPRIO, 0, NULL, isjson);
}
-static void disablepool(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
+static void disablepool(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
{
struct pool *pool;
int id;
if (total_pools == 0) {
- strcpy(io_buffer, message(MSG_NOPOOL, 0, NULL, isjson));
+ message(io_data, MSG_NOPOOL, 0, NULL, isjson);
return;
}
if (param == NULL || *param == '\0') {
- strcpy(io_buffer, message(MSG_MISPID, 0, NULL, isjson));
+ message(io_data, MSG_MISPID, 0, NULL, isjson);
return;
}
id = atoi(param);
if (id < 0 || id >= total_pools) {
- strcpy(io_buffer, message(MSG_INVPID, id, NULL, isjson));
+ message(io_data, MSG_INVPID, id, NULL, isjson);
return;
}
pool = pools[id];
if (pool->enabled == POOL_DISABLED) {
- strcpy(io_buffer, message(MSG_ALRDISP, id, NULL, isjson));
+ message(io_data, MSG_ALRDISP, id, NULL, isjson);
return;
}
if (enabled_pools <= 1) {
- strcpy(io_buffer, message(MSG_DISLASTP, id, NULL, isjson));
+ message(io_data, MSG_DISLASTP, id, NULL, isjson);
return;
}
@@ -2343,10 +2460,10 @@ static void disablepool(__maybe_unused SOCKETTYPE c, char *param, bool isjson, _
if (pool == current_pool())
switch_pools(NULL);
- strcpy(io_buffer, message(MSG_DISPOOL, id, NULL, isjson));
+ message(io_data, MSG_DISPOOL, id, NULL, isjson);
}
-static void removepool(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
+static void removepool(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
{
struct pool *pool;
char *rpc_url;
@@ -2354,23 +2471,23 @@ static void removepool(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __
int id;
if (total_pools == 0) {
- strcpy(io_buffer, message(MSG_NOPOOL, 0, NULL, isjson));
+ message(io_data, MSG_NOPOOL, 0, NULL, isjson);
return;
}
if (param == NULL || *param == '\0') {
- strcpy(io_buffer, message(MSG_MISPID, 0, NULL, isjson));
+ message(io_data, MSG_MISPID, 0, NULL, isjson);
return;
}
id = atoi(param);
if (id < 0 || id >= total_pools) {
- strcpy(io_buffer, message(MSG_INVPID, id, NULL, isjson));
+ message(io_data, MSG_INVPID, id, NULL, isjson);
return;
}
if (total_pools <= 1) {
- strcpy(io_buffer, message(MSG_REMLASTP, id, NULL, isjson));
+ message(io_data, MSG_REMLASTP, id, NULL, isjson);
return;
}
@@ -2379,7 +2496,7 @@ static void removepool(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __
switch_pools(NULL);
if (pool == current_pool()) {
- strcpy(io_buffer, message(MSG_ACTPOOL, id, NULL, isjson));
+ message(io_data, MSG_ACTPOOL, id, NULL, isjson);
return;
}
@@ -2390,7 +2507,7 @@ static void removepool(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __
remove_pool(pool);
- strcpy(io_buffer, message(MSG_REMPOOL, id, rpc_url, isjson));
+ message(io_data, MSG_REMPOOL, id, rpc_url, isjson);
if (dofree)
free(rpc_url);
@@ -2398,24 +2515,24 @@ static void removepool(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __
}
#ifdef HAVE_OPENCL
-static bool splitgpuvalue(char *param, int *gpu, char **value, bool isjson)
+static bool splitgpuvalue(struct io_data *io_data, char *param, int *gpu, char **value, bool isjson)
{
int id;
char *gpusep;
if (nDevs == 0) {
- strcpy(io_buffer, message(MSG_GPUNON, 0, NULL, isjson));
+ message(io_data, MSG_GPUNON, 0, NULL, isjson);
return false;
}
if (param == NULL || *param == '\0') {
- strcpy(io_buffer, message(MSG_MISID, 0, NULL, isjson));
+ message(io_data, MSG_MISID, 0, NULL, isjson);
return false;
}
gpusep = strchr(param, GPUSEP);
if (gpusep == NULL) {
- strcpy(io_buffer, message(MSG_MISVAL, 0, NULL, isjson));
+ message(io_data, MSG_MISVAL, 0, NULL, isjson);
return false;
}
@@ -2423,7 +2540,7 @@ static bool splitgpuvalue(char *param, int *gpu, char **value, bool isjson)
id = atoi(param);
if (id < 0 || id >= nDevs) {
- strcpy(io_buffer, message(MSG_INVGPU, id, NULL, isjson));
+ message(io_data, MSG_INVGPU, id, NULL, isjson);
return false;
}
@@ -2432,14 +2549,15 @@ static bool splitgpuvalue(char *param, int *gpu, char **value, bool isjson)
return true;
}
-static void gpuintensity(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
+
+static void gpuintensity(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
{
int id;
char *value;
int intensity;
char intensitystr[7];
- if (!splitgpuvalue(param, &id, &value, isjson))
+ if (!splitgpuvalue(io_data, param, &id, &value, isjson))
return;
if (!strncasecmp(value, DYNAMIC, 1)) {
@@ -2449,7 +2567,7 @@ static void gpuintensity(__maybe_unused SOCKETTYPE c, char *param, bool isjson,
else {
intensity = atoi(value);
if (intensity < MIN_INTENSITY || intensity > MAX_INTENSITY) {
- strcpy(io_buffer, message(MSG_INVINT, 0, value, isjson));
+ message(io_data, MSG_INVINT, 0, value, isjson);
return;
}
@@ -2458,121 +2576,122 @@ static void gpuintensity(__maybe_unused SOCKETTYPE c, char *param, bool isjson,
sprintf(intensitystr, "%d", intensity);
}
- strcpy(io_buffer, message(MSG_GPUINT, id, intensitystr, isjson));
+ message(io_data, MSG_GPUINT, id, intensitystr, isjson);
}
-static void gpumem(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
+static void gpumem(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
{
#ifdef HAVE_ADL
int id;
char *value;
int clock;
- if (!splitgpuvalue(param, &id, &value, isjson))
+ if (!splitgpuvalue(io_data, param, &id, &value, isjson))
return;
clock = atoi(value);
if (set_memoryclock(id, clock))
- strcpy(io_buffer, message(MSG_GPUMERR, id, value, isjson));
+ message(io_data, MSG_GPUMERR, id, value, isjson);
else
- strcpy(io_buffer, message(MSG_GPUMEM, id, value, isjson));
+ message(io_data, MSG_GPUMEM, id, value, isjson);
#else
- strcpy(io_buffer, message(MSG_NOADL, 0, NULL, isjson));
+ message(io_data, MSG_NOADL, 0, NULL, isjson);
#endif
}
-static void gpuengine(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
+static void gpuengine(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
{
#ifdef HAVE_ADL
int id;
char *value;
int clock;
- if (!splitgpuvalue(param, &id, &value, isjson))
+ if (!splitgpuvalue(io_data, param, &id, &value, isjson))
return;
clock = atoi(value);
if (set_engineclock(id, clock))
- strcpy(io_buffer, message(MSG_GPUEERR, id, value, isjson));
+ message(io_data, MSG_GPUEERR, id, value, isjson);
else
- strcpy(io_buffer, message(MSG_GPUENG, id, value, isjson));
+ message(io_data, MSG_GPUENG, id, value, isjson);
#else
- strcpy(io_buffer, message(MSG_NOADL, 0, NULL, isjson));
+ message(io_data, MSG_NOADL, 0, NULL, isjson);
#endif
}
-static void gpufan(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
+static void gpufan(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
{
#ifdef HAVE_ADL
int id;
char *value;
int fan;
- if (!splitgpuvalue(param, &id, &value, isjson))
+ if (!splitgpuvalue(io_data, param, &id, &value, isjson))
return;
fan = atoi(value);
if (set_fanspeed(id, fan))
- strcpy(io_buffer, message(MSG_GPUFERR, id, value, isjson));
+ message(io_data, MSG_GPUFERR, id, value, isjson);
else
- strcpy(io_buffer, message(MSG_GPUFAN, id, value, isjson));
+ message(io_data, MSG_GPUFAN, id, value, isjson);
#else
- strcpy(io_buffer, message(MSG_NOADL, 0, NULL, isjson));
+ message(io_data, MSG_NOADL, 0, NULL, isjson);
#endif
}
-static void gpuvddc(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
+static void gpuvddc(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
{
#ifdef HAVE_ADL
int id;
char *value;
float vddc;
- if (!splitgpuvalue(param, &id, &value, isjson))
+ if (!splitgpuvalue(io_data, param, &id, &value, isjson))
return;
vddc = atof(value);
if (set_vddc(id, vddc))
- strcpy(io_buffer, message(MSG_GPUVERR, id, value, isjson));
+ message(io_data, MSG_GPUVERR, id, value, isjson);
else
- strcpy(io_buffer, message(MSG_GPUVDDC, id, value, isjson));
+ message(io_data, MSG_GPUVDDC, id, value, isjson);
#else
- strcpy(io_buffer, message(MSG_NOADL, 0, NULL, isjson));
+ message(io_data, MSG_NOADL, 0, NULL, isjson);
#endif
}
#endif
-void doquit(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
+
+void doquit(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
{
if (isjson)
- strcpy(io_buffer, JSON_START JSON_BYE);
+ io_put(io_data, JSON_START JSON_BYE);
else
- strcpy(io_buffer, _BYE);
+ io_put(io_data, _BYE);
bye = true;
do_a_quit = true;
}
-void dorestart(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
+void dorestart(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
{
if (isjson)
- strcpy(io_buffer, JSON_START JSON_RESTART);
+ io_put(io_data, JSON_START JSON_RESTART);
else
- strcpy(io_buffer, _RESTART);
+ io_put(io_data, _RESTART);
bye = true;
do_a_restart = true;
}
-void privileged(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
+void privileged(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
{
- strcpy(io_buffer, message(MSG_ACCOK, 0, NULL, isjson));
+ message(io_data, MSG_ACCOK, 0, NULL, isjson);
}
-void notifystatus(int device, struct cgpu_info *cgpu, bool isjson, __maybe_unused char group)
+void notifystatus(struct io_data *io_data, int device, struct cgpu_info *cgpu, bool isjson, __maybe_unused char group)
{
struct api_data *root = NULL;
char buf[TMPBUFSIZ];
@@ -2633,54 +2752,49 @@ void notifystatus(int device, struct cgpu_info *cgpu, bool isjson, __maybe_unuse
root = api_add_int(root, "*Dev Comms Error", &(cgpu->dev_comms_error_count), false);
root = api_add_int(root, "*Dev Throttle", &(cgpu->dev_throttle_count), false);
- if (isjson && (device > 0))
- strcat(io_buffer, COMMA);
-
- root = print_data(root, buf, isjson);
- strcat(io_buffer, buf);
+ root = print_data(root, buf, isjson, isjson && (device > 0));
+ io_add(io_data, buf);
}
-static void notify(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, char group)
+static void notify(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, char group)
{
+ bool io_open = false;
int i;
if (total_devices == 0) {
- strcpy(io_buffer, message(MSG_NODEVS, 0, NULL, isjson));
+ message(io_data, MSG_NODEVS, 0, NULL, isjson);
return;
}
- strcpy(io_buffer, message(MSG_NOTIFY, 0, NULL, isjson));
+ message(io_data, MSG_NOTIFY, 0, NULL, isjson);
- if (isjson) {
- strcat(io_buffer, COMMA);
- strcat(io_buffer, JSON_NOTIFY);
- }
+ if (isjson)
+ io_open = io_add(io_data, COMSTR JSON_NOTIFY);
for (i = 0; i < total_devices; i++)
- notifystatus(i, devices[i], isjson, group);
+ notifystatus(io_data, i, devices[i], isjson, group);
- if (isjson)
- strcat(io_buffer, JSON_CLOSE);
+ if (isjson && io_open)
+ io_close(io_data);
}
-static void devdetails(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
+static void devdetails(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
{
struct api_data *root = NULL;
char buf[TMPBUFSIZ];
+ bool io_open = false;
struct cgpu_info *cgpu;
int i;
if (total_devices == 0) {
- strcpy(io_buffer, message(MSG_NODEVS, 0, NULL, isjson));
+ message(io_data, MSG_NODEVS, 0, NULL, isjson);
return;
}
- strcpy(io_buffer, message(MSG_DEVDETAILS, 0, NULL, isjson));
+ message(io_data, MSG_DEVDETAILS, 0, NULL, isjson);
- if (isjson) {
- strcat(io_buffer, COMMA);
- strcat(io_buffer, JSON_DEVDETAILS);
- }
+ if (isjson)
+ io_open = io_add(io_data, COMSTR JSON_DEVDETAILS);
for (i = 0; i < total_devices; i++) {
cgpu = devices[i];
@@ -2693,18 +2807,15 @@ static void devdetails(__maybe_unused SOCKETTYPE c, __maybe_unused char *param,
root = api_add_const(root, "Model", cgpu->name ? : BLANK, false);
root = api_add_const(root, "Device Path", cgpu->device_path ? : BLANK, false);
- if (isjson && (i > 0))
- strcat(io_buffer, COMMA);
-
- root = print_data(root, buf, isjson);
- strcat(io_buffer, buf);
+ root = print_data(root, buf, isjson, isjson && (i > 0));
+ io_add(io_data, buf);
}
- if (isjson)
- strcat(io_buffer, JSON_CLOSE);
+ if (isjson && io_open)
+ io_close(io_data);
}
-void dosave(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
+void dosave(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
{
char filename[PATH_MAX];
FILE *fcfg;
@@ -2718,7 +2829,7 @@ void dosave(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unuse
fcfg = fopen(param, "w");
if (!fcfg) {
ptr = escape_string(param, isjson);
- strcpy(io_buffer, message(MSG_BADFN, 0, ptr, isjson));
+ message(io_data, MSG_BADFN, 0, ptr, isjson);
if (ptr != param)
free(ptr);
ptr = NULL;
@@ -2729,13 +2840,13 @@ void dosave(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unuse
fclose(fcfg);
ptr = escape_string(param, isjson);
- strcpy(io_buffer, message(MSG_SAVED, 0, ptr, isjson));
+ message(io_data, MSG_SAVED, 0, ptr, isjson);
if (ptr != param)
free(ptr);
ptr = NULL;
}
-static int itemstats(int i, char *id, struct cgminer_stats *stats, struct cgminer_pool_stats *pool_stats, struct api_data *extra, bool isjson)
+static int itemstats(struct io_data *io_data, int i, char *id, struct cgminer_stats *stats, struct cgminer_pool_stats *pool_stats, struct api_data *extra, bool isjson)
{
struct api_data *root = NULL;
char buf[TMPBUFSIZ];
@@ -2769,27 +2880,23 @@ static int itemstats(int i, char *id, struct cgminer_stats *stats, struct cgmine
if (extra)
root = api_add_extra(root, extra);
- if (isjson && (i > 0))
- strcat(io_buffer, COMMA);
-
- root = print_data(root, buf, isjson);
- strcat(io_buffer, buf);
+ root = print_data(root, buf, isjson, isjson && (i > 0));
+ io_add(io_data, buf);
return ++i;
}
-static void minerstats(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
+static void minerstats(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
{
+ bool io_open = false;
struct api_data *extra;
char id[20];
int i, j;
- strcpy(io_buffer, message(MSG_MINESTATS, 0, NULL, isjson));
+ message(io_data, MSG_MINESTATS, 0, NULL, isjson);
- if (isjson) {
- strcat(io_buffer, COMMA);
- strcat(io_buffer, JSON_MINESTATS);
- }
+ if (isjson)
+ io_open = io_add(io_data, COMSTR JSON_MINESTATS);
i = 0;
for (j = 0; j < total_devices; j++) {
@@ -2802,7 +2909,7 @@ static void minerstats(__maybe_unused SOCKETTYPE c, __maybe_unused char *param,
extra = NULL;
sprintf(id, "%s%d", cgpu->api->name, cgpu->device_id);
- i = itemstats(i, id, &(cgpu->cgminer_stats), NULL, extra, isjson);
+ i = itemstats(io_data, i, id, &(cgpu->cgminer_stats), NULL, extra, isjson);
}
}
@@ -2810,24 +2917,24 @@ static void minerstats(__maybe_unused SOCKETTYPE c, __maybe_unused char *param,
struct pool *pool = pools[j];
sprintf(id, "POOL%d", j);
- i = itemstats(i, id, &(pool->cgminer_stats), &(pool->cgminer_pool_stats), NULL, isjson);
+ i = itemstats(io_data, i, id, &(pool->cgminer_stats), &(pool->cgminer_pool_stats), NULL, isjson);
}
- if (isjson)
- strcat(io_buffer, JSON_CLOSE);
+ if (isjson && io_open)
+ io_close(io_data);
}
-static void failoveronly(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
+static void failoveronly(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
{
if (param == NULL || *param == '\0') {
- strcpy(io_buffer, message(MSG_MISBOOL, 0, NULL, isjson));
+ message(io_data, MSG_MISBOOL, 0, NULL, isjson);
return;
}
*param = tolower(*param);
if (*param != 't' && *param != 'f') {
- strcpy(io_buffer, message(MSG_INVBOOL, 0, NULL, isjson));
+ message(io_data, MSG_INVBOOL, 0, NULL, isjson);
return;
}
@@ -2835,18 +2942,17 @@ static void failoveronly(__maybe_unused SOCKETTYPE c, char *param, bool isjson,
opt_fail_only = tf;
- strcpy(io_buffer, message(MSG_FOO, tf, NULL, isjson));
+ message(io_data, MSG_FOO, tf, NULL, isjson);
}
-static void minecoin(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
+static void minecoin(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
{
struct api_data *root = NULL;
char buf[TMPBUFSIZ];
+ bool io_open;
- sprintf(io_buffer, isjson
- ? "%s," JSON_MINECOIN
- : "%s" _MINECOIN ",",
- message(MSG_MINECOIN, 0, NULL, isjson));
+ message(io_data, MSG_MINECOIN, 0, NULL, isjson);
+ io_open = io_add(io_data, isjson ? COMSTR JSON_MINECOIN : _MINECOIN COMSTR);
#ifdef USE_SCRYPT
if (opt_scrypt)
@@ -2868,16 +2974,17 @@ static void minecoin(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bo
root = api_add_bool(root, "LP", &have_longpoll, false);
- root = print_data(root, buf, isjson);
- if (isjson)
- strcat(buf, JSON_CLOSE);
- strcat(io_buffer, buf);
+ root = print_data(root, buf, isjson, false);
+ io_add(io_data, buf);
+ if (isjson && io_open)
+ io_close(io_data);
}
-static void debugstate(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
+static void debugstate(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
{
struct api_data *root = NULL;
char buf[TMPBUFSIZ];
+ bool io_open;
if (param == NULL)
param = (char *)BLANK;
@@ -2922,15 +3029,21 @@ static void debugstate(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __
case 'w':
opt_worktime ^= true;
break;
+#ifdef _MEMORY_DEBUG
+ case 'y':
+ cgmemspeedup();
+ break;
+ case 'z':
+ cgmemrpt();
+ break;
+#endif
default:
// anything else just reports the settings
break;
}
- sprintf(io_buffer, isjson
- ? "%s," JSON_DEBUGSET
- : "%s" _DEBUGSET ",",
- message(MSG_DEBUGSET, 0, NULL, isjson));
+ message(io_data, MSG_DEBUGSET, 0, NULL, isjson);
+ io_open = io_add(io_data, isjson ? COMSTR JSON_DEBUGSET : _DEBUGSET COMSTR);
root = api_add_bool(root, "Silent", &opt_realquiet, false);
root = api_add_bool(root, "Quiet", &opt_quiet, false);
@@ -2940,32 +3053,32 @@ static void debugstate(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __
root = api_add_bool(root, "PerDevice", &want_per_device_stats, false);
root = api_add_bool(root, "WorkTime", &opt_worktime, false);
- root = print_data(root, buf, isjson);
- if (isjson)
- strcat(buf, JSON_CLOSE);
- strcat(io_buffer, buf);
+ root = print_data(root, buf, isjson, false);
+ io_add(io_data, buf);
+ if (isjson && io_open)
+ io_close(io_data);
}
-static void setconfig(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
+static void setconfig(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
{
char *comma;
int value;
if (param == NULL || *param == '\0') {
- strcpy(io_buffer, message(MSG_CONPAR, 0, NULL, isjson));
+ message(io_data, MSG_CONPAR, 0, NULL, isjson);
return;
}
comma = strchr(param, ',');
if (!comma) {
- strcpy(io_buffer, message(MSG_CONVAL, 0, param, isjson));
+ message(io_data, MSG_CONVAL, 0, param, isjson);
return;
}
*(comma++) = '\0';
value = atoi(comma);
if (value < 0 || value > 9999) {
- strcpy(io_buffer, message(MSG_INVNUM, value, param, isjson));
+ message(io_data, MSG_INVNUM, value, param, isjson);
return;
}
@@ -2976,61 +3089,59 @@ static void setconfig(__maybe_unused SOCKETTYPE c, char *param, bool isjson, __m
else if (strcasecmp(param, "expiry") == 0)
opt_expiry = value;
else {
- strcpy(io_buffer, message(MSG_UNKCON, 0, param, isjson));
+ message(io_data, MSG_UNKCON, 0, param, isjson);
return;
}
- strcpy(io_buffer, message(MSG_SETCONFIG, value, param, isjson));
+ message(io_data, MSG_SETCONFIG, value, param, isjson);
}
-static void usbstats(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
+static void usbstats(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson, __maybe_unused char group)
{
struct api_data *root = NULL;
#ifdef USE_MODMINER
char buf[TMPBUFSIZ];
+ bool io_open = false;
int count = 0;
root = api_usb_stats(&count);
#endif
if (!root) {
- strcpy(io_buffer, message(MSG_NOUSTA, 0, NULL, isjson));
+ message(io_data, MSG_NOUSTA, 0, NULL, isjson);
return;
}
#ifdef USE_MODMINER
- strcpy(io_buffer, message(MSG_USBSTA, 0, NULL, isjson));
+ message(io_data, MSG_USBSTA, 0, NULL, isjson);
- if (isjson) {
- strcat(io_buffer, COMMA);
- strcat(io_buffer, JSON_USBSTATS);
- }
+ if (isjson)
+ io_open = io_add(io_data, COMSTR JSON_USBSTATS);
- root = print_data(root, buf, isjson);
- strcat(io_buffer, buf);
+ root = print_data(root, buf, isjson, false);
+ io_add(io_data, buf);
while (42) {
root = api_usb_stats(&count);
if (!root)
break;
- strcat(io_buffer, COMMA);
- root = print_data(root, buf, isjson);
- strcat(io_buffer, buf);
+ root = print_data(root, buf, isjson, isjson);
+ io_add(io_data, buf);
}
- if (isjson)
- strcat(io_buffer, JSON_CLOSE);
+ if (isjson && io_open)
+ io_close(io_data);
#endif
}
-static void checkcommand(__maybe_unused SOCKETTYPE c, char *param, bool isjson, char group);
+static void checkcommand(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, char group);
struct CMDS {
char *name;
- void (*func)(SOCKETTYPE, char *, bool, char);
+ void (*func)(struct io_data *, SOCKETTYPE, char *, bool, char);
bool iswritemode;
} cmds[] = {
{ "version", apiversion, false },
@@ -3085,16 +3196,17 @@ struct CMDS {
{ NULL, NULL, false }
};
-static void checkcommand(__maybe_unused SOCKETTYPE c, char *param, bool isjson, char group)
+static void checkcommand(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, char group)
{
struct api_data *root = NULL;
char buf[TMPBUFSIZ];
+ bool io_open;
char cmdbuf[100];
bool found, access;
int i;
if (param == NULL || *param == '\0') {
- strcpy(io_buffer, message(MSG_MISCHK, 0, NULL, isjson));
+ message(io_data, MSG_MISCHK, 0, NULL, isjson);
return;
}
@@ -3112,34 +3224,42 @@ static void checkcommand(__maybe_unused SOCKETTYPE c, char *param, bool isjson,
}
}
- sprintf(io_buffer, isjson
- ? "%s," JSON_CHECK
- : "%s" _CHECK ",",
- message(MSG_CHECK, 0, NULL, isjson));
+ message(io_data, MSG_CHECK, 0, NULL, isjson);
+ io_open = io_add(io_data, isjson ? COMSTR JSON_CHECK : _CHECK COMSTR);
root = api_add_const(root, "Exists", found ? YES : NO, false);
root = api_add_const(root, "Access", access ? YES : NO, false);
- root = print_data(root, buf, isjson);
- if (isjson)
- strcat(buf, JSON_CLOSE);
- strcat(io_buffer, buf);
+ root = print_data(root, buf, isjson, false);
+ io_add(io_data, buf);
+ if (isjson && io_open)
+ io_close(io_data);
}
-static void send_result(SOCKETTYPE c, bool isjson)
+static void send_result(struct io_data *io_data, SOCKETTYPE c, bool isjson)
{
- int n;
+ char buf[SOCKBUFSIZ + sizeof(JSON_CLOSE) + sizeof(JSON_END)];
int len;
+ int n;
- if (isjson)
- strcat(io_buffer, JSON_END);
+ strcpy(buf, io_data->ptr);
+
+ if (io_data->close)
+ strcat(buf, JSON_CLOSE);
- len = strlen(io_buffer);
+ if (isjson) {
+ if (io_data->full)
+ strcat(buf, JSON_END_TRUNCATED);
+ else
+ strcat(buf, JSON_END);
+ }
- applog(LOG_DEBUG, "API: send reply: (%d) '%.10s%s'", len+1, io_buffer, len > 10 ? "..." : BLANK);
+ len = strlen(buf);
+
+ applog(LOG_DEBUG, "API: send reply: (%d) '%.10s%s'", len+1, buf, len > 10 ? "..." : BLANK);
// ignore failure - it's closed immediately anyway
- n = send(c, io_buffer, len+1, 0);
+ n = send(c, buf, len+1, 0);
if (opt_debug) {
if (SOCKETFAIL(n))
@@ -3166,15 +3286,7 @@ static void tidyup(__maybe_unused void *arg)
ipaccess = NULL;
}
- if (msg_buffer != NULL) {
- free(msg_buffer);
- msg_buffer = NULL;
- }
-
- if (io_buffer != NULL) {
- free(io_buffer);
- io_buffer = NULL;
- }
+ io_free();
mutex_unlock(&quit_restart_lock);
}
@@ -3457,6 +3569,7 @@ static void *restart_thread(__maybe_unused void *userdata)
void api(int api_thr_id)
{
+ struct io_data *io_data;
struct thr_info bye_thr;
char buf[TMPBUFSIZ];
char param_buf[TMPBUFSIZ];
@@ -3487,6 +3600,8 @@ void api(int api_thr_id)
return;
}
+ io_data = sock_io_new();
+
mutex_init(&quit_restart_lock);
pthread_cleanup_push(tidyup, NULL);
@@ -3577,9 +3692,6 @@ void api(int api_thr_id)
applog(LOG_WARNING, "API running in local read access mode on port %d", port);
}
- io_buffer = malloc(MYBUFSIZ+1);
- msg_buffer = malloc(MYBUFSIZ+1);
-
while (!bye) {
clisiz = sizeof(cli);
if (SOCKETFAIL(c = accept(sock, (struct sockaddr *)(&cli), &clisiz))) {
@@ -3627,6 +3739,7 @@ void api(int api_thr_id)
if (!SOCKETFAIL(n)) {
// the time of the request in now
when = time(NULL);
+ io_reinit(io_data);
did = false;
@@ -3653,21 +3766,21 @@ void api(int api_thr_id)
#endif
if (!json_is_object(json_config)) {
- strcpy(io_buffer, message(MSG_INVJSON, 0, NULL, isjson));
- send_result(c, isjson);
+ message(io_data, MSG_INVJSON, 0, NULL, isjson);
+ send_result(io_data, c, isjson);
did = true;
}
else {
json_val = json_object_get(json_config, JSON_COMMAND);
if (json_val == NULL) {
- strcpy(io_buffer, message(MSG_MISCMD, 0, NULL, isjson));
- send_result(c, isjson);
+ message(io_data, MSG_MISCMD, 0, NULL, isjson);
+ send_result(io_data, c, isjson);
did = true;
}
else {
if (!json_is_string(json_val)) {
- strcpy(io_buffer, message(MSG_INVCMD, 0, NULL, isjson));
- send_result(c, isjson);
+ message(io_data, MSG_INVCMD, 0, NULL, isjson);
+ send_result(io_data, c, isjson);
did = true;
}
else {
@@ -3692,21 +3805,21 @@ void api(int api_thr_id)
if (strcmp(cmd, cmds[i].name) == 0) {
sprintf(cmdbuf, "|%s|", cmd);
if (ISPRIVGROUP(group) || strstr(COMMANDS(group), cmdbuf))
- (cmds[i].func)(c, param, isjson, group);
+ (cmds[i].func)(io_data, c, param, isjson, group);
else {
- strcpy(io_buffer, message(MSG_ACCDENY, 0, cmds[i].name, isjson));
+ message(io_data, MSG_ACCDENY, 0, cmds[i].name, isjson);
applog(LOG_DEBUG, "API: access denied to '%s' for '%s' command", connectaddr, cmds[i].name);
}
- send_result(c, isjson);
+ send_result(io_data, c, isjson);
did = true;
break;
}
}
if (!did) {
- strcpy(io_buffer, message(MSG_INVCMD, 0, NULL, isjson));
- send_result(c, isjson);
+ message(io_data, MSG_INVCMD, 0, NULL, isjson);
+ send_result(io_data, c, isjson);
}
}
}