Browse Source

Release v1.4 with blake

master
Tanguy Pruvot 10 years ago
parent
commit
033fb5745c
  1. 3
      README.md
  2. 29
      hashlog.cpp
  3. 4
      miner.h
  4. 2
      util.c

3
README.md

@ -4,6 +4,7 @@ ccminer @@ -4,6 +4,7 @@ ccminer
Christian Buchner's & Christian H.'s CUDA miner project
Fork by tpruvot@github with X14,X15,X17,WHIRL and Blake256 support
BTC donation address: 1AJdfCpLWPNoAMDfHF1wD5y8VgKSSTHxPo
[![tip for next commit](https://tip4commit.com/projects/927.svg)](https://tip4commit.com/github/tpruvot/ccminer)
@ -26,8 +27,6 @@ This project requires some libraries to be built : @@ -26,8 +27,6 @@ This project requires some libraries to be built :
- pthreads
- [mpir math library](http://www.mpir.org)
You can download prebuilt .lib and dll on the [bitcointalk forum thread](https://bitcointalk.org/?topic=167229.0)

29
hashlog.cpp

@ -202,24 +202,25 @@ extern "C" void hashlog_purge_all(void) @@ -202,24 +202,25 @@ extern "C" void hashlog_purge_all(void)
tlastshares.clear();
}
/**
* Can be used to debug...
* Used to debug ranges...
*/
extern "C" void hashlog_dump_job(char* jobid)
{
int deleted = 0;
uint64_t njobid = hextouint(jobid);
uint64_t keypfx = (njobid << 32);
uint32_t sz = tlastshares.size();
std::map<uint64_t, hashlog_data>::iterator i = tlastshares.begin();
while (i != tlastshares.end()) {
if ((keypfx & i->first) == keypfx) {
applog(LOG_BLUE, "job %s range : %x %x %s added %x upd %x", jobid,
i->second.scanned_from, i->second.scanned_to,
i->second.tm_sent ? "sent" : "",
i->second.tm_add, i->second.tm_upd);/* */
if (opt_debug) {
int deleted = 0;
uint64_t njobid = hextouint(jobid);
uint64_t keypfx = (njobid << 32);
uint32_t sz = tlastshares.size();
std::map<uint64_t, hashlog_data>::iterator i = tlastshares.begin();
while (i != tlastshares.end()) {
if ((keypfx & i->first) == keypfx) {
applog(LOG_BLUE, "job %s range : %x %x %s added %x upd %x", jobid,
i->second.scanned_from, i->second.scanned_to,
i->second.tm_sent ? "sent" : "",
i->second.tm_add, i->second.tm_upd);/* */
}
i++;
}
i++;
}
}

4
miner.h

@ -317,7 +317,7 @@ extern uint16_t opt_vote; @@ -317,7 +317,7 @@ extern uint16_t opt_vote;
#define CL_BLK "\x1B[22;30m" /* black */
#define CL_RD2 "\x1B[22;31m" /* red */
#define CL_GR2 "\x1B[22;32m" /* green */
#define CL_BRW "\x1B[22;33m" /* brown */
#define CL_YL2 "\x1B[22;33m" /* dark yellow */
#define CL_BL2 "\x1B[22;34m" /* blue */
#define CL_MA2 "\x1B[22;35m" /* magenta */
#define CL_CY2 "\x1B[22;36m" /* cyan */
@ -326,7 +326,7 @@ extern uint16_t opt_vote; @@ -326,7 +326,7 @@ extern uint16_t opt_vote;
#define CL_GRY "\x1B[01;30m" /* dark gray */
#define CL_LRD "\x1B[01;31m" /* light red */
#define CL_LGR "\x1B[01;32m" /* light green */
#define CL_YL2 "\x1B[01;33m" /* yellow */
#define CL_LYL "\x1B[01;33m" /* tooltips */
#define CL_LBL "\x1B[01;34m" /* light blue */
#define CL_LMA "\x1B[01;35m" /* light magenta */
#define CL_LCY "\x1B[01;36m" /* light cyan */

2
util.c

@ -115,7 +115,7 @@ void applog(int prio, const char *fmt, ...) @@ -115,7 +115,7 @@ void applog(int prio, const char *fmt, ...)
case LOG_WARNING: color = CL_YLW; break;
case LOG_NOTICE: color = CL_WHT; break;
case LOG_INFO: color = ""; break;
case LOG_DEBUG: color = CL_SIL; break;
case LOG_DEBUG: color = CL_GRY; break;
case LOG_BLUE:
prio = LOG_NOTICE;

Loading…
Cancel
Save