git.iko.soy/xmrig-bash-scripts
on master help sign in
cleaning
7837c86Sean Wheller
functions.sh+18−20
compare with master
unifiedsplit
@@ -52,29 +52,27 @@ check_cpu () {
52calc_threads () {
52calc_threads () {
53
53
54 # Affine number of threads for _CPU_CN
54 # Affine number of threads for _CPU_CN
55− _COUNTER="$(($_ENV_CORE_THREADS - 1))"
55+ _COUNTER="$(( $_ENV_CORE-1 ))"
56− _ENV_CPU_THREADS=()
57
56
58− for i in `seq 0 $_COUNTER`; do
57+ _ENV_CPU_THREAD_AFFINITY="$(seq -s " " 0 $_COUNTER)"
59− _ENV_CPU_THREADS+=("$i")
60− done
61
58
62− _ENV_CPU_THREAD_AFFINITY="$_ENV_CPU_THREADS"
59+}
63−
64− # Setting according to cpu cores but xmrig will not use all
65− # change to make value use _ENV_CORE_THREADS
66− # Check that hugepages set in /etc/sysctl.conf
67−
68− _ENV_CHECK="nr_hugepages"
69
60
61+calc_hugepages () {
62+ # Setting according to cpu cores but xmrig will not use all
63+ # change to make value use _ENV_CORE_THREADS
64+ # Check that hugepages set in /etc/sysctl.conf
65+
66+ _ENV_CHECK="nr_hugepages"
67+
70− if sudo grep -q $_ENV_CHECK /etc/sysctl.conf; then
68+ if sudo grep -q $_ENV_CHECK /etc/sysctl.conf; then
71− sudo sysctl -p
69+ sudo sysctl -p
72− else
70+ else
73− # Set value in current env
71+ # Set value in current env
74− sudo sysctl -w vm.nr_hugepages="$_ENV_CORE"
72+ sudo sysctl -w vm.nr_hugepages="$_ENV_CORE"
75− # Add value to sysctl
73+ # Add value to sysctl
76− sudo sysctl -p
74+ sudo sysctl -p
77− fi
75+ fi
78
76
79}
77}
80
78
settings.sh+1−1
@@ -71,7 +71,7 @@ _USER_AGENT="null"
71
71
72_WATCH="true"
72_WATCH="true"
73
73
74−_CONFIG_JSON=$(jo -p -B api=$(jo id=$_API_ID worker-id=$_API_WORKER_ID) autosave=$_AUTOSAVE background=$_BACKGROUND colors=$_COLORS cpu=$(jo enabled=$_CPU_ENABLED huge-pages=$_CPU_HUGE_PAGES hw-aes=$_CPU_HW_AES priority=$_CPU_PRIORITY asm=$_CPU_ASM cn=$(jo $_CPU_CN) cn/0=$_CPU_CN_0 cn-lite/0=$_CPU_CN_LITE_0) donate-level=$_DONATE_LEVEL donate-over-proxy=$_DONATE_OVER_PROXY http=$(jo enabled=$_HTTP_ENABLED host=$_HTTP_HOST port=$_HTTP_PORT access-token=$_HTTP_ACCESS_TOKEN restricted=$_HTTP_RESTRICTED) logfile=$_LOGFILE pools=$(jo -a $(jo algo=$_POOLS_ALGO url=$_POOLS_URL user=$_POOLS_USER pass=$_POOLS_PASS rig-id=$_POOLS_RIG_ID nicehash=$_POOLS_NICEHASH keepalive=$_POOLS_KEEPALIVE enabled=$_POOLS_ENABLED tls=$_POOLS_TLS tls-fingerprint=$_POOLS_TLS_FINDERPRINT daemon=$_POOLS_DAEMON)) print-time=$_PRINT_TIME retries=$_RETRIES retry-pause=$_RETRIES_PAUSE syslog=$_SYSLOG user-agent=$_USER_AGENT watch=$_WATCH)
74+_CONFIG_JSON=$(jo -p -B api=$(jo id=$_API_ID worker-id=$_API_WORKER_ID) autosave=$_AUTOSAVE background=$_BACKGROUND colors=$_COLORS cpu=$(jo enabled=$_CPU_ENABLED huge-pages=$_CPU_HUGE_PAGES hw-aes=$_CPU_HW_AES priority=$_CPU_PRIORITY asm=$_CPU_ASM cn=$(jo -a $_CPU_CN) cn/0=$_CPU_CN_0 cn-lite/0=$_CPU_CN_LITE_0) donate-level=$_DONATE_LEVEL donate-over-proxy=$_DONATE_OVER_PROXY http=$(jo enabled=$_HTTP_ENABLED host=$_HTTP_HOST port=$_HTTP_PORT access-token=$_HTTP_ACCESS_TOKEN restricted=$_HTTP_RESTRICTED) logfile=$_LOGFILE pools=$(jo -a $(jo algo=$_POOLS_ALGO url=$_POOLS_URL user=$_POOLS_USER pass=$_POOLS_PASS rig-id=$_POOLS_RIG_ID nicehash=$_POOLS_NICEHASH keepalive=$_POOLS_KEEPALIVE enabled=$_POOLS_ENABLED tls=$_POOLS_TLS tls-fingerprint=$_POOLS_TLS_FINDERPRINT daemon=$_POOLS_DAEMON)) print-time=$_PRINT_TIME retries=$_RETRIES retry-pause=$_RETRIES_PAUSE syslog=$_SYSLOG user-agent=$_USER_AGENT watch=$_WATCH)
75
75
76# Set working directory
76# Set working directory
77_WORK_DIR="$(pwd)"
77_WORK_DIR="$(pwd)"