GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-02-10 22:14:18 +00:00
Code Issues Releases Wiki Activity

Simplify code to a single vprintf path for curses-less printing

Browse Source
This commit is contained in:
Luke Dashjr 2012-07-23 20:15:45 +00:00
parent 80593c47fc
commit d98e561a0a
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cgminer.c
View File

@ -164,9 +164,7 @@ static int total_threads;
static pthread_mutex_t hash_lock; static pthread_mutex_t hash_lock;
static pthread_mutex_t qd_lock; static pthread_mutex_t qd_lock;
static pthread_mutex_t *stgd_lock; static pthread_mutex_t *stgd_lock;
#ifdef HAVE_CURSES
static pthread_mutex_t curses_lock; static pthread_mutex_t curses_lock;
#endif
static pthread_mutex_t ch_lock; static pthread_mutex_t ch_lock;
static pthread_rwlock_t blk_lock; static pthread_rwlock_t blk_lock;
@ -1562,7 +1560,7 @@ void wlogprint(const char *f, ...)
#endif #endif
#ifdef HAVE_CURSES #ifdef HAVE_CURSES
void log_curses(int prio, const char *f, va_list ap) bool log_curses_only(int prio, const char *f, va_list ap)
{ {
bool high_prio; bool high_prio;
@ -1577,8 +1575,9 @@ void log_curses(int prio, const char *f, va_list ap)
} }
} }
unlock_curses(); unlock_curses();
} else return true;
vprintf(f, ap); }
return false;
} }
void clear_logwin(void) void clear_logwin(void)

8
logging.c
View File

@ -25,8 +25,8 @@ static void my_log_curses(__maybe_unused int prio, char *f, va_list ap)
#ifdef HAVE_CURSES #ifdef HAVE_CURSES
extern bool use_curses; extern bool use_curses;
if (use_curses) if (use_curses && log_curses_only(prio, f, ap))
log_curses(prio, f, ap); ;
else else
#endif #endif
{ {
@ -34,11 +34,7 @@ static void my_log_curses(__maybe_unused int prio, char *f, va_list ap)
strcpy(f + len - 1, " \n"); strcpy(f + len - 1, " \n");
#ifdef HAVE_CURSES
log_curses(prio, f, ap);
#else
vprintf(f, ap); vprintf(f, ap);
#endif
} }
} }

2
miner.h
View File

@ -797,7 +797,7 @@ extern void switch_pools(struct pool *selected);
extern void remove_pool(struct pool *pool); extern void remove_pool(struct pool *pool);
extern void write_config(FILE *fcfg); extern void write_config(FILE *fcfg);
extern void default_save_file(char *filename); extern void default_save_file(char *filename);
extern void log_curses(int prio, const char *f, va_list ap); extern bool log_curses_only(int prio, const char *f, va_list ap);
extern void clear_logwin(void); extern void clear_logwin(void);
extern bool pool_tclear(struct pool *pool, bool *var); extern bool pool_tclear(struct pool *pool, bool *var);
extern struct thread_q *tq_new(void); extern struct thread_q *tq_new(void);