From b772349f698f02f02cdc4eff7cd7ef899dd74d64 Mon Sep 17 00:00:00 2001 From: XMRig Date: Sat, 10 Jun 2017 01:20:54 +0300 Subject: [PATCH] Add memory summary. --- mac/cpu_mac.c | 47 ---- mac/memory_mac.c | 76 ------- mac/xmrig_mac.c | 91 -------- memory.c | 76 ------- options.c | 520 -------------------------------------------- options.h | 91 -------- persistent_memory.h | 50 ----- src/Mem.h | 10 +- src/Mem_win.cpp | 6 +- src/Summary.cpp | 14 ++ unix/memory_unix.c | 76 ------- unix/xmrig_unix.c | 91 -------- win/xmrig_win.c | 84 ------- 13 files changed, 23 insertions(+), 1209 deletions(-) delete mode 100644 mac/cpu_mac.c delete mode 100644 mac/memory_mac.c delete mode 100644 mac/xmrig_mac.c delete mode 100644 memory.c delete mode 100644 options.c delete mode 100644 options.h delete mode 100644 persistent_memory.h delete mode 100644 unix/memory_unix.c delete mode 100644 unix/xmrig_unix.c delete mode 100644 win/xmrig_win.c diff --git a/mac/cpu_mac.c b/mac/cpu_mac.c deleted file mode 100644 index 88bda541..00000000 --- a/mac/cpu_mac.c +++ /dev/null @@ -1,47 +0,0 @@ -/* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2016-2017 XMRig - * - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include - -#include "cpu.h" - - -struct cpu_info cpu_info = { 0 }; -void cpu_init_common(); - - -void cpu_init() { -# ifdef XMRIG_NO_LIBCPUID - cpu_info.total_logical_cpus = sysconf(_SC_NPROCESSORS_CONF); -# endif - - cpu_init_common(); -} - - -int affine_to_cpu_mask(int id, unsigned long mask) -{ - return 0; -} diff --git a/mac/memory_mac.c b/mac/memory_mac.c deleted file mode 100644 index 3f5f714c..00000000 --- a/mac/memory_mac.c +++ /dev/null @@ -1,76 +0,0 @@ -/* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2016-2017 XMRig - * - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include - -#include "persistent_memory.h" -#include "options.h" -#include "utils/applog.h" - -char *persistent_memory; -int persistent_memory_flags = 0; - - -const char * persistent_memory_allocate() { - const int ratio = (opt_double_hash && opt_algo != ALGO_CRYPTONIGHT_LITE) ? 2 : 1; - const int size = MEMORY * (opt_n_threads * ratio + 1); - persistent_memory_flags |= MEMORY_HUGEPAGES_AVAILABLE; - - persistent_memory = mmap(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, VM_FLAGS_SUPERPAGE_SIZE_2MB, 0); - - if (persistent_memory == MAP_FAILED) { - persistent_memory = _mm_malloc(size, 16); - return persistent_memory; - } - - persistent_memory_flags |= MEMORY_HUGEPAGES_ENABLED; - - if (madvise(persistent_memory, size, MADV_RANDOM | MADV_WILLNEED) != 0) { - applog(LOG_ERR, "madvise failed"); - } - - if (mlock(persistent_memory, size) == 0) { - persistent_memory_flags |= MEMORY_LOCK; - } - - return persistent_memory; -} - - -void persistent_memory_free() { - const int size = MEMORY * (opt_n_threads + 1); - - if (persistent_memory_flags & MEMORY_HUGEPAGES_ENABLED) { - if (persistent_memory_flags & MEMORY_LOCK) { - munlock(persistent_memory, size); - } - - munmap(persistent_memory, size); - } - else { - _mm_free(persistent_memory); - } -} diff --git a/mac/xmrig_mac.c b/mac/xmrig_mac.c deleted file mode 100644 index f7278c6d..00000000 --- a/mac/xmrig_mac.c +++ /dev/null @@ -1,91 +0,0 @@ -/* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2016-2017 XMRig - * - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include - -#include "options.h" -#include "cpu.h" -#include "utils/applog.h" - - -static void signal_handler(int sig) -{ - switch (sig) { - case SIGHUP: - applog(LOG_WARNING, "SIGHUP received"); - break; - - case SIGINT: - applog(LOG_WARNING, "SIGINT received, exiting"); - proper_exit(0); - break; - - case SIGTERM: - applog(LOG_WARNING, "SIGTERM received, exiting"); - proper_exit(0); - break; - } -} - - -void proper_exit(int reason) { - exit(reason); -} - - -void os_specific_init() -{ - if (opt_affinity != -1) { - affine_to_cpu_mask(-1, opt_affinity); - } - - if (opt_background) { - int i = fork(); - if (i < 0) { - exit(1); - } - - if (i > 0) { - exit(0); - } - - i = setsid(); - - if (i < 0) { - applog(LOG_ERR, "setsid() failed (errno = %d)", errno); - } - - i = chdir("/"); - if (i < 0) { - applog(LOG_ERR, "chdir() failed (errno = %d)", errno); - } - - signal(SIGHUP, signal_handler); - signal(SIGTERM, signal_handler); - } - - signal(SIGINT, signal_handler); -} diff --git a/memory.c b/memory.c deleted file mode 100644 index 112f1115..00000000 --- a/memory.c +++ /dev/null @@ -1,76 +0,0 @@ -/* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2016-2017 XMRig - * - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include - -#include "persistent_memory.h" -#include "algo/cryptonight/cryptonight.h" -#include "options.h" - -static size_t offset = 0; - - -#ifndef XMRIG_NO_AEON -static void * create_persistent_ctx_lite(int thr_id) { - struct cryptonight_ctx *ctx = NULL; - - if (!opt_double_hash) { - const size_t offset = MEMORY * (thr_id + 1); - - ctx = (struct cryptonight_ctx *) &persistent_memory[offset + MEMORY_LITE]; - ctx->memory = (uint8_t*) &persistent_memory[offset]; - return ctx; - } - - ctx = (struct cryptonight_ctx *) &persistent_memory[MEMORY - sizeof(struct cryptonight_ctx) * (thr_id + 1)]; - ctx->memory = (uint8_t*) &persistent_memory[MEMORY * (thr_id + 1)]; - - return ctx; -} -#endif - - -void * persistent_calloc(size_t num, size_t size) { - void *mem = &persistent_memory[offset]; - offset += (num * size); - - memset(mem, 0, num * size); - - return mem; -} - - -void * create_persistent_ctx(int thr_id) { -# ifndef XMRIG_NO_AEON - if (opt_algo == ALGO_CRYPTONIGHT_LITE) { - return create_persistent_ctx_lite(thr_id); - } -# endif - - struct cryptonight_ctx *ctx = (struct cryptonight_ctx *) &persistent_memory[MEMORY - sizeof(struct cryptonight_ctx) * (thr_id + 1)]; - - const int ratio = opt_double_hash ? 2 : 1; - ctx->memory = (uint8_t*) &persistent_memory[MEMORY * (thr_id * ratio + 1)]; - - return ctx; -} diff --git a/options.c b/options.c deleted file mode 100644 index eb88bcb0..00000000 --- a/options.c +++ /dev/null @@ -1,520 +0,0 @@ -/* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2016-2017 XMRig - * - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include -#include -#include - -#include "version.h" -#include "utils/applog.h" -#include "options.h" -#include "cpu.h" -#include "donate.h" -#include "algo/cryptonight/cryptonight.h" - - -int64_t opt_affinity = -1L; -int opt_n_threads = 0; -int opt_algo_variant = 0; -int opt_retries = 5; -int opt_retry_pause = 5; -int opt_donate_level = DONATE_LEVEL; -int opt_max_cpu_usage = 75; -bool opt_colors = true; -bool opt_keepalive = false; -bool opt_background = false; -bool opt_double_hash = false; -bool opt_safe = false; -bool opt_nicehash = false; -char *opt_url = NULL; -char *opt_backup_url = NULL; -char *opt_userpass = NULL; -char *opt_user = NULL; -char *opt_pass = NULL; - -enum mining_algo opt_algo = ALGO_CRYPTONIGHT; - - -static char const usage[] = "\ -Usage: " APP_ID " [OPTIONS]\n\ -Options:\n\ - -a, --algo=ALGO cryptonight (default) or cryptonight-lite\n\ - -o, --url=URL URL of mining server\n\ - -b, --backup-url=URL URL of backup mining server\n\ - -O, --userpass=U:P username:password pair for mining server\n\ - -u, --user=USERNAME username for mining server\n\ - -p, --pass=PASSWORD password for mining server\n\ - -t, --threads=N number of miner threads\n\ - -v, --av=N algorithm variation, 0 auto select\n\ - -k, --keepalive send keepalived for prevent timeout (need pool support)\n\ - -r, --retries=N number of times to retry before switch to backup server (default: 5)\n\ - -R, --retry-pause=N time to pause between retries (default: 5)\n\ - --cpu-affinity set process affinity to CPU core(s), mask 0x3 for cores 0 and 1\n\ - --no-color disable colored output\n\ - --donate-level=N donate level, default 5%% (5 minutes in 100 minutes)\n\ - -B, --background run the miner in the background\n\ - -c, --config=FILE load a JSON-format configuration file\n\ - --max-cpu-usage=N maximum CPU usage for automatic threads mode (default 75)\n\ - --safe safe adjust threads and av settings for current CPU\n\ - --nicehash enable nicehash support\n\ - -h, --help display this help and exit\n\ - -V, --version output version information and exit\n\ -"; - - -static char const short_options[] = "a:c:khBp:Px:r:R:s:t:T:o:u:O:v:Vb:"; - - -static struct option const options[] = { - { "algo", 1, NULL, 'a' }, - { "av", 1, NULL, 'v' }, - { "background", 0, NULL, 'B' }, - { "backup-url", 1, NULL, 'b' }, - { "config", 1, NULL, 'c' }, - { "cpu-affinity", 1, NULL, 1020 }, - { "donate-level", 1, NULL, 1003 }, - { "help", 0, NULL, 'h' }, - { "keepalive", 0, NULL ,'k' }, - { "max-cpu-usage", 1, NULL, 1004 }, - { "nicehash", 0, NULL, 1006 }, - { "no-color", 0, NULL, 1002 }, - { "pass", 1, NULL, 'p' }, - { "retries", 1, NULL, 'r' }, - { "retry-pause", 1, NULL, 'R' }, - { "safe", 0, NULL, 1005 }, - { "threads", 1, NULL, 't' }, - { "url", 1, NULL, 'o' }, - { "user", 1, NULL, 'u' }, - { "userpass", 1, NULL, 'O' }, - { "version", 0, NULL, 'V' }, - { 0, 0, 0, 0 } -}; - - -static const char *algo_names[] = { - [ALGO_CRYPTONIGHT] = "cryptonight", -# ifndef XMRIG_NO_AEON - [ALGO_CRYPTONIGHT_LITE] = "cryptonight-lite" -# endif -}; - - -#ifndef XMRIG_NO_AEON -static int get_cryptonight_lite_variant(int variant) { - if (variant <= AEON_AV0_AUTO || variant >= AEON_AV_MAX) { - return (cpu_info.flags & CPU_FLAG_AES) ? AEON_AV2_AESNI_DOUBLE : AEON_AV4_SOFT_AES_DOUBLE; - } - - if (opt_safe && !(cpu_info.flags & CPU_FLAG_AES) && variant <= AEON_AV2_AESNI_DOUBLE) { - return variant + 2; - } - - return variant; -} -#endif - - -static int get_algo_variant(int algo, int variant) { -# ifndef XMRIG_NO_AEON - if (algo == ALGO_CRYPTONIGHT_LITE) { - return get_cryptonight_lite_variant(variant); - } -# endif - - if (variant <= XMR_AV0_AUTO || variant >= XMR_AV_MAX) { - return (cpu_info.flags & CPU_FLAG_AES) ? XMR_AV1_AESNI : XMR_AV3_SOFT_AES; - } - - if (opt_safe && !(cpu_info.flags & CPU_FLAG_AES) && variant <= XMR_AV2_AESNI_DOUBLE) { - return variant + 2; - } - - return variant; -} - - -static void parse_config(json_t *config, char *ref); -static char *parse_url(const char *arg); - - -static void parse_arg(int key, char *arg) { - char *p; - int v; - uint64_t ul; - - switch (key) - { - case 'a': - for (int i = 0; i < ARRAY_SIZE(algo_names); i++) { - if (algo_names[i] && !strcmp(arg, algo_names[i])) { - opt_algo = i; - break; - } - -# ifndef XMRIG_NO_AEON - if (i == ARRAY_SIZE(algo_names) && !strcmp(arg, "cryptonight-light")) { - opt_algo = i = ALGO_CRYPTONIGHT_LITE; - } -# endif - - if (i == ARRAY_SIZE(algo_names)) { - show_usage_and_exit(1); - } - } - break; - - case 'O': /* --userpass */ - p = strchr(arg, ':'); - if (!p) { - show_usage_and_exit(1); - } - - free(opt_userpass); - opt_userpass = strdup(arg); - free(opt_user); - opt_user = calloc(p - arg + 1, 1); - strncpy(opt_user, arg, p - arg); - free(opt_pass); - opt_pass = strdup(p + 1); - break; - - case 'o': /* --url */ - p = parse_url(arg); - if (p) { - free(opt_url); - opt_url = p; - } - break; - - case 'b': /* --backup-url */ - p = parse_url(arg); - if (p) { - free(opt_backup_url); - opt_backup_url = p; - } - break; - - case 'u': /* --user */ - free(opt_user); - opt_user = strdup(arg); - break; - - case 'p': /* --pass */ - free(opt_pass); - opt_pass = strdup(arg); - break; - - case 'r': /* --retries */ - v = atoi(arg); - if (v < 1 || v > 1000) { - show_usage_and_exit(1); - } - - opt_retries = v; - break; - - case 'R': /* --retry-pause */ - v = atoi(arg); - if (v < 1 || v > 3600) { - show_usage_and_exit(1); - } - - opt_retry_pause = v; - break; - - case 't': /* --threads */ - v = atoi(arg); - if (v < 1 || v > 1024) { - show_usage_and_exit(1); - } - - opt_n_threads = v; - break; - - case 1004: /* --max-cpu-usage */ - v = atoi(arg); - if (v < 1 || v > 100) { - show_usage_and_exit(1); - } - - opt_max_cpu_usage = v; - break; - - case 1005: /* --safe */ - opt_safe = true; - break; - - case 'k': /* --keepalive */ - opt_keepalive = true; - break; - - case 'V': /* --version */ - show_version_and_exit(); - break; - - case 'h': /* --help */ - show_usage_and_exit(0); - break; - - case 'c': { /* --config */ - json_error_t err; - json_t *config = json_load_file(arg, 0, &err); - - if (!json_is_object(config)) { - if (err.line < 0) { - applog(LOG_ERR, "%s\n", err.text); - } - else { - applog(LOG_ERR, "%s:%d: %s\n", arg, err.line, err.text); - } - } else { - parse_config(config, arg); - json_decref(config); - } - break; - } - - case 'B': /* --background */ - opt_background = true; - opt_colors = false; - break; - - case 'v': /* --av */ - v = atoi(arg); - if (v < 0 || v > 1000) { - show_usage_and_exit(1); - } - - opt_algo_variant = v; - break; - - case 1020: /* --cpu-affinity */ - p = strstr(arg, "0x"); - ul = p ? strtoul(p, NULL, 16) : atol(arg); - if (ul > (1UL << cpu_info.total_logical_cpus) -1) { - ul = -1; - } - - opt_affinity = ul; - break; - - case 1002: /* --no-color */ - opt_colors = false; - break; - - case 1003: /* --donate-level */ - v = atoi(arg); - if (v < 1 || v > 99) { - show_usage_and_exit(1); - } - - opt_donate_level = v; - break; - - case 1006: /* --nicehash */ - opt_nicehash = true; - break; - - default: - show_usage_and_exit(1); - } -} - - -static void parse_config(json_t *config, char *ref) -{ - int i; - char buf[16]; - json_t *val; - - applog(LOG_ERR, ref); - - for (i = 0; i < ARRAY_SIZE(options); i++) { - if (!options[i].name) { - break; - } - - val = json_object_get(config, options[i].name); - if (!val) { - continue; - } - - if (options[i].has_arg && json_is_string(val)) { - char *s = strdup(json_string_value(val)); - if (!s) { - break; - } - - parse_arg(options[i].val, s); - free(s); - } - else if (options[i].has_arg && json_is_integer(val)) { - sprintf(buf, "%d", (int) json_integer_value(val)); - parse_arg(options[i].val, buf); - } - else if (options[i].has_arg && json_is_real(val)) { - sprintf(buf, "%f", json_real_value(val)); - parse_arg(options[i].val, buf); - } - else if (!options[i].has_arg) { - if (json_is_true(val)) { - parse_arg(options[i].val, ""); - } - } - else { - applog(LOG_ERR, "JSON option %s invalid", options[i].name); - } - } -} - - -static char *parse_url(const char *arg) -{ - char *p = strstr(arg, "://"); - if (p) { - if (strncasecmp(arg, "stratum+tcp://", 14)) { - show_usage_and_exit(1); - } - - return strdup(arg); - } - - - if (!strlen(arg) || *arg == '/') { - show_usage_and_exit(1); - } - - char *dest = malloc(strlen(arg) + 16); - sprintf(dest, "stratum+tcp://%s", arg); - - return dest; -} - - -/** - * Parse application command line via getopt. - */ -void parse_cmdline(int argc, char *argv[]) { - opt_user = strdup("x"); - opt_pass = strdup("x"); - - int key; - - while (1) { - key = getopt_long(argc, argv, short_options, options, NULL); - if (key < 0) { - break; - } - - parse_arg(key, optarg); - } - - if (optind < argc) { - fprintf(stderr, "%s: unsupported non-option argument '%s'\n", argv[0], argv[optind]); - show_usage_and_exit(1); - } - - if (!opt_url) { - applog_notime(LOG_ERR, "No pool URL supplied. Exiting.\n", argv[0]); - proper_exit(1); - } - - if (strstr(opt_url, ".nicehash.com:") != NULL) { - opt_nicehash = true; - } - - if (!opt_userpass) { - opt_userpass = malloc(strlen(opt_user) + strlen(opt_pass) + 2); - if (!opt_userpass) { - proper_exit(1); - } - - sprintf(opt_userpass, "%s:%s", opt_user, opt_pass); - } - - opt_algo_variant = get_algo_variant(opt_algo, opt_algo_variant); - - if (!cryptonight_init(opt_algo_variant)) { - applog(LOG_ERR, "Cryptonight hash self-test failed. This might be caused by bad compiler optimizations."); - proper_exit(1); - } - - if (!opt_n_threads) { - opt_n_threads = get_optimal_threads_count(opt_algo, opt_double_hash, opt_max_cpu_usage); - } - - if (opt_safe) { - const int count = get_optimal_threads_count(opt_algo, opt_double_hash, opt_max_cpu_usage); - if (opt_n_threads > count) { - opt_n_threads = count; - } - } -} - - -void show_usage_and_exit(int status) { - if (status) { - fprintf(stderr, "Try \"" APP_ID "\" --help' for more information.\n"); - } - else { - printf(usage); - } - - proper_exit(status); -} - - -void show_version_and_exit(void) { - printf(APP_NAME " " APP_VERSION "\n built on " __DATE__ - - #ifdef __GNUC__ - " with GCC"); - printf(" %d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__); - #endif - - printf("\n features:" - #ifdef __i386__ - " i386" - #endif - #ifdef __x86_64__ - " x86_64" - #endif - #ifdef __AES__ - " AES-NI" - #endif - "\n"); - - printf("\n%s\n", curl_version()); - #ifdef JANSSON_VERSION - printf("libjansson/%s\n", JANSSON_VERSION); - #endif - proper_exit(0); -} - - -const char* get_current_algo_name(void) { - return algo_names[opt_algo]; -} diff --git a/options.h b/options.h deleted file mode 100644 index a14aaeeb..00000000 --- a/options.h +++ /dev/null @@ -1,91 +0,0 @@ -/* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2016-2017 XMRig - * - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __OPTIONS_H__ -#define __OPTIONS_H__ - -#include -#include - -#ifndef ARRAY_SIZE -# define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) -#endif - - -enum mining_algo { - ALGO_CRYPTONIGHT, /* CryptoNight (Monero) */ - ALGO_CRYPTONIGHT_LITE, /* CryptoNight-Lite (AEON) */ -}; - - -enum xmr_algo_variant { - XMR_AV0_AUTO, - XMR_AV1_AESNI, - XMR_AV2_AESNI_DOUBLE, - XMR_AV3_SOFT_AES, - XMR_AV4_SOFT_AES_DOUBLE, - XMR_AV_MAX -}; - - -#ifndef XMRIG_NO_AEON -enum aeon_algo_variant { - AEON_AV0_AUTO, - AEON_AV1_AESNI, - AEON_AV2_AESNI_DOUBLE, - AEON_AV3_SOFT_AES, - AEON_AV4_SOFT_AES_DOUBLE, - AEON_AV_MAX -}; -#endif - - -extern bool opt_colors; -extern bool opt_keepalive; -extern bool opt_background; -extern bool opt_double_hash; -extern bool opt_safe; -extern bool opt_nicehash; -extern char *opt_url; -extern char *opt_backup_url; -extern char *opt_userpass; -extern char *opt_user; -extern char *opt_pass; -extern int opt_n_threads; -extern int opt_algo_variant; -extern int opt_retry_pause; -extern int opt_retries; -extern int opt_donate_level; -extern int opt_max_cpu_usage; -extern int64_t opt_affinity; -extern enum mining_algo opt_algo; - -void parse_cmdline(int argc, char *argv[]); -void show_usage_and_exit(int status); -void show_version_and_exit(void); -const char* get_current_algo_name(void); - -extern void proper_exit(int reason); - - -#endif /* __OPTIONS_H__ */ diff --git a/persistent_memory.h b/persistent_memory.h deleted file mode 100644 index 5a6d6ca7..00000000 --- a/persistent_memory.h +++ /dev/null @@ -1,50 +0,0 @@ -/* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2016-2017 XMRig - * - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __PERSISTENT_MEMORY_H__ -#define __PERSISTENT_MEMORY_H__ - -#include - - -enum memory_flags { - MEMORY_HUGEPAGES_AVAILABLE = 1, - MEMORY_HUGEPAGES_ENABLED = 2, - MEMORY_LOCK = 4 -}; - - -#define MEMORY 2097152 - - -extern char *persistent_memory; -extern int persistent_memory_flags; - - -const char * persistent_memory_allocate(); -void persistent_memory_free(); -void * persistent_calloc(size_t num, size_t size); -void * create_persistent_ctx(int thr_id); - - -#endif /* __PERSISTENT_MEMORY_H__ */ diff --git a/src/Mem.h b/src/Mem.h index 21a9f0f9..ac89c363 100644 --- a/src/Mem.h +++ b/src/Mem.h @@ -35,9 +35,9 @@ class Mem { public: enum Flags { - HUGEPAGES_AVAILABLE = 1, - HUGEPAGES_ENABLED = 2, - LOCK = 4 + HugepagesAvailable = 1, + HugepagesEnabled = 2, + Lock = 4 }; static bool allocate(int algo, int threads, bool doubleHash); @@ -45,7 +45,9 @@ public: static void *calloc(size_t num, size_t size); static void release(); - static inline int flags() { return m_flags; } + static inline bool isHugepagesAvailable() { return m_flags & HugepagesAvailable; } + static inline bool isHugepagesEnabled() { return m_flags & HugepagesEnabled; } + static inline int flags() { return m_flags; } private: static bool m_doubleHash; diff --git a/src/Mem_win.cpp b/src/Mem_win.cpp index 42114eaf..18b54ba3 100644 --- a/src/Mem_win.cpp +++ b/src/Mem_win.cpp @@ -147,7 +147,7 @@ bool Mem::allocate(int algo, int threads, bool doubleHash) const size_t size = MEMORY * (threads * ratio + 1); if (TrySetLockPagesPrivilege()) { - m_flags |= HUGEPAGES_AVAILABLE; + m_flags |= HugepagesAvailable; } m_memory = static_cast(VirtualAlloc(NULL, size, MEM_COMMIT | MEM_RESERVE | MEM_LARGE_PAGES, PAGE_READWRITE)); @@ -155,7 +155,7 @@ bool Mem::allocate(int algo, int threads, bool doubleHash) m_memory = static_cast(_mm_malloc(size, 16)); } else { - m_flags |= HUGEPAGES_ENABLED; + m_flags |= HugepagesEnabled; } return true; @@ -164,7 +164,7 @@ bool Mem::allocate(int algo, int threads, bool doubleHash) void Mem::release() { - if (m_flags & HUGEPAGES_ENABLED) { + if (m_flags & HugepagesEnabled) { VirtualFree(m_memory, 0, MEM_RELEASE); } else { diff --git a/src/Summary.cpp b/src/Summary.cpp index b7e97a0f..502747c9 100644 --- a/src/Summary.cpp +++ b/src/Summary.cpp @@ -27,6 +27,7 @@ #include "Console.h" #include "Cpu.h" +#include "Mem.h" #include "Options.h" #include "Summary.h" #include "version.h" @@ -51,6 +52,18 @@ static void print_versions() } +static void print_memory() { + if (Options::i()->colors()) { + Console::i()->text("\x1B[01;32m * \x1B[01;37mHUGE PAGES: %s, %s", + Mem::isHugepagesAvailable() ? "\x1B[01;32mavailable" : "\x1B[01;31munavailable", + Mem::isHugepagesEnabled() ? "\x1B[01;32menabled" : "\x1B[01;31mdisabled"); + } + else { + Console::i()->text(" * HUGE PAGES: %s, %s", Mem::isHugepagesAvailable() ? "available" : "unavailable", Mem::isHugepagesEnabled() ? "enabled" : "disabled"); + } +} + + static void print_cpu() { if (Options::i()->colors()) { @@ -104,6 +117,7 @@ static void print_threads() void Summary::print() { print_versions(); + print_memory(); print_cpu(); print_threads(); } diff --git a/unix/memory_unix.c b/unix/memory_unix.c deleted file mode 100644 index 2e794a03..00000000 --- a/unix/memory_unix.c +++ /dev/null @@ -1,76 +0,0 @@ -/* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2016-2017 XMRig - * - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include - -#include "persistent_memory.h" -#include "options.h" -#include "utils/applog.h" - - -char *persistent_memory; -int persistent_memory_flags = 0; - - -const char * persistent_memory_allocate() { - const int ratio = (opt_double_hash && opt_algo != ALGO_CRYPTONIGHT_LITE) ? 2 : 1; - const int size = MEMORY * (opt_n_threads * ratio + 1); - persistent_memory_flags |= MEMORY_HUGEPAGES_AVAILABLE; - - persistent_memory = mmap(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB | MAP_POPULATE, 0, 0); - - if (persistent_memory == MAP_FAILED) { - persistent_memory = _mm_malloc(size, 16); - return persistent_memory; - } - - persistent_memory_flags |= MEMORY_HUGEPAGES_ENABLED; - - if (madvise(persistent_memory, size, MADV_RANDOM | MADV_WILLNEED) != 0) { - applog(LOG_ERR, "madvise failed"); - } - - if (mlock(persistent_memory, size) == 0) { - persistent_memory_flags |= MEMORY_LOCK; - } - - return persistent_memory; -} - - -void persistent_memory_free() { - const int size = MEMORY * (opt_n_threads + 1); - - if (persistent_memory_flags & MEMORY_HUGEPAGES_ENABLED) { - if (persistent_memory_flags & MEMORY_LOCK) { - munlock(persistent_memory, size); - } - - munmap(persistent_memory, size); - } - else { - _mm_free(persistent_memory); - } -} diff --git a/unix/xmrig_unix.c b/unix/xmrig_unix.c deleted file mode 100644 index cd25934a..00000000 --- a/unix/xmrig_unix.c +++ /dev/null @@ -1,91 +0,0 @@ -/* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2016-2017 XMRig - * - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include - -#include "options.h" -#include "cpu.h" -#include "utils/applog.h" - - -static void signal_handler(int sig) -{ - switch (sig) { - case SIGHUP: - applog(LOG_WARNING, "SIGHUP received"); - break; - - case SIGINT: - applog(LOG_WARNING, "SIGINT received, exiting"); - proper_exit(0); - break; - - case SIGTERM: - applog(LOG_WARNING, "SIGTERM received, exiting"); - proper_exit(0); - break; - } -} - - -void proper_exit(int reason) { - exit(reason); -} - - -void os_specific_init() -{ - if (opt_affinity != -1) { - affine_to_cpu_mask(-1, opt_affinity); - } - - if (opt_background) { - int i = fork(); - if (i < 0) { - exit(1); - } - - if (i > 0) { - exit(0); - } - - i = setsid(); - - if (i < 0) { - applog(LOG_ERR, "setsid() failed (errno = %d)", errno); - } - - i = chdir("/"); - if (i < 0) { - applog(LOG_ERR, "chdir() failed (errno = %d)", errno); - } - - signal(SIGHUP, signal_handler); - signal(SIGTERM, signal_handler); - } - - signal(SIGINT, signal_handler); -} diff --git a/win/xmrig_win.c b/win/xmrig_win.c deleted file mode 100644 index 96921faa..00000000 --- a/win/xmrig_win.c +++ /dev/null @@ -1,84 +0,0 @@ -/* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2016-2017 XMRig - * - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include - -#include "options.h" -#include "cpu.h" -#include "utils/applog.h" - - -BOOL WINAPI ConsoleHandler(DWORD dwType) -{ - switch (dwType) { - case CTRL_C_EVENT: - applog(LOG_WARNING, "CTRL_C_EVENT received, exiting"); - proper_exit(0); - break; - - case CTRL_BREAK_EVENT: - applog(LOG_WARNING, "CTRL_BREAK_EVENT received, exiting"); - proper_exit(0); - break; - - default: - return false; -} - - return true; -} - - -void proper_exit(int reason) { - if (opt_background) { - HWND hcon = GetConsoleWindow(); - if (hcon) { - // unhide parent command line windows - ShowWindow(hcon, SW_SHOWMINNOACTIVE); - } - } - - exit(reason); -} - - -void os_specific_init() -{ - if (opt_affinity != -1) { - affine_to_cpu_mask(-1, opt_affinity); - } - - SetConsoleCtrlHandler((PHANDLER_ROUTINE)ConsoleHandler, TRUE); - - if (opt_background) { - HWND hcon = GetConsoleWindow(); - if (hcon) { - // this method also hide parent command line window - ShowWindow(hcon, SW_HIDE); - } else { - HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE); - CloseHandle(h); - FreeConsole(); - } - } -}