GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-31 17:04:23 +00:00
Code Issues Releases Wiki Activity

Display version information and add --version command line option, and make sure we flush stdout.

Browse Source
This commit is contained in:
Con Kolivas 2011-08-29 11:52:10 +10:00
parent 807ddd1c2e
commit 5c7ea9e55b
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccan/opt/helpers.c
View File

@ -120,12 +120,14 @@ char *opt_inc_intval(int *i)
char *opt_version_and_exit(const char *version) char *opt_version_and_exit(const char *version)
{ {
printf("%s\n", version); printf("%s\n", version);
fflush(stdout);
exit(0); exit(0);
} }
char *opt_usage_and_exit(const char *extra) char *opt_usage_and_exit(const char *extra)
{ {
printf("%s", opt_usage(opt_argv0, extra)); printf("%s", opt_usage(opt_argv0, extra));
fflush(stdout);
exit(0); exit(0);
} }

40
main.c
View File

@ -46,8 +46,6 @@
#include <sys/types.h> #include <sys/types.h>
#endif #endif
#define PROGRAM_NAME "cgminer"
#ifdef __linux /* Linux specific policy and affinity management */ #ifdef __linux /* Linux specific policy and affinity management */
#include <sched.h> #include <sched.h>
static inline void drop_policy(void) static inline void drop_policy(void)
@ -174,6 +172,8 @@ static const sha256_func sha256_funcs[] = {
#endif #endif
}; };
static char packagename[255];
bool opt_debug = false; bool opt_debug = false;
bool opt_protocol = false; bool opt_protocol = false;
static bool want_longpoll = true; static bool want_longpoll = true;
@ -331,7 +331,7 @@ void get_timestamp(char *f, struct timeval *tv)
static void applog_and_exit(const char *fmt, ...) static void applog_and_exit(const char *fmt, ...)
{ {
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
vapplog(LOG_ERR, fmt, ap); vapplog(LOG_ERR, fmt, ap);
va_end(ap); va_end(ap);
@ -1252,6 +1252,22 @@ static char *print_ndevs_and_exit(int *ndevs)
} }
#endif #endif
extern const char *opt_argv0;
static char *opt_verusage_and_exit(const char *extra)
{
printf("%s\n"
#ifdef HAVE_OPENCL
"Built with CPU and GPU mining support.\n"
#else
"Built with CPU mining support only.\n"
#endif
, packagename);
printf("%s", opt_usage(opt_argv0, extra));
fflush(stdout);
exit(0);
}
/* These options are available from commandline only */ /* These options are available from commandline only */
static struct opt_table opt_cmdline_table[] = { static struct opt_table opt_cmdline_table[] = {
OPT_WITH_ARG("--config|-c", OPT_WITH_ARG("--config|-c",
@ -1259,18 +1275,16 @@ static struct opt_table opt_cmdline_table[] = {
"Load a JSON-format configuration file\n" "Load a JSON-format configuration file\n"
"See example-cfg.json for an example configuration."), "See example-cfg.json for an example configuration."),
OPT_WITHOUT_ARG("--help|-h", OPT_WITHOUT_ARG("--help|-h",
opt_usage_and_exit, opt_verusage_and_exit, NULL,
#ifdef HAVE_OPENCL
"\nBuilt with CPU and GPU mining support.\n",
#else
"\nBuilt with CPU mining support only.\n",
#endif
"Print this message"), "Print this message"),
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
OPT_WITHOUT_ARG("--ndevs|-n", OPT_WITHOUT_ARG("--ndevs|-n",
print_ndevs_and_exit, &nDevs, print_ndevs_and_exit, &nDevs,
"Enumerate number of detected GPUs and exit"), "Enumerate number of detected GPUs and exit"),
#endif #endif
OPT_WITHOUT_ARG("--version|-V",
opt_version_and_exit, packagename,
"Display version and exit"),
OPT_ENDTABLE OPT_ENDTABLE
}; };
@ -1373,7 +1387,7 @@ static void curses_print_status(int thr_id)
wmove(statuswin, 0, 0); wmove(statuswin, 0, 0);
wattron(statuswin, A_BOLD); wattron(statuswin, A_BOLD);
wprintw(statuswin, " " PROGRAM_NAME " version " VERSION " - Started: %s", datestamp); wprintw(statuswin, " " PACKAGE " version " VERSION " - Started: %s", datestamp);
if (opt_n_threads) if (opt_n_threads)
wprintw(statuswin, " CPU Algo: %s", algo_names[opt_algo]); wprintw(statuswin, " CPU Algo: %s", algo_names[opt_algo]);
wattroff(statuswin, A_BOLD); wattroff(statuswin, A_BOLD);
@ -4494,6 +4508,8 @@ int main (int argc, char *argv[])
if (unlikely(pthread_rwlock_init(&blk_lock, NULL))) if (unlikely(pthread_rwlock_init(&blk_lock, NULL)))
quit(1, "Failed to pthread_rwlock_init"); quit(1, "Failed to pthread_rwlock_init");
sprintf(packagename, "%s %s", PACKAGE, VERSION);
init_max_name_len(); init_max_name_len();
handler.sa_handler = &sighandler; handler.sa_handler = &sighandler;
@ -4570,6 +4586,8 @@ int main (int argc, char *argv[])
if (argc != 1) if (argc != 1)
quit(1, "Unexpected extra commandline arguments"); quit(1, "Unexpected extra commandline arguments");
applog(LOG_WARNING, "Started %s", packagename);
if (opt_nogpu) if (opt_nogpu)
nDevs = 0; nDevs = 0;
@ -4703,7 +4721,7 @@ int main (int argc, char *argv[])
#ifdef HAVE_SYSLOG_H #ifdef HAVE_SYSLOG_H
if (use_syslog) if (use_syslog)
openlog(PROGRAM_NAME, LOG_PID, LOG_USER); openlog(PACKAGE, LOG_PID, LOG_USER);
#endif #endif
#if defined(unix) #if defined(unix)