popov/cpuminer-opt-gpu
1
0
Fork 0
mirror of https://github.com/JayDDee/cpuminer-opt.git synced 2025-09-17 23:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

v3.14.1

Browse Source
This commit is contained in:
Jay D Dee
2020-05-21 13:00:29 -04:00
parent 9571f85d53
commit 13563e2598
4 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
RELEASE_NOTES
View File

@@ -65,6 +65,17 @@ If not what makes it happen or not happen?
Change Log Change Log
---------- ----------
v3.14.1
GBT and getwork log changes:
fixed missing TTF in New Block log,
ntime no longer byte-swapped for display in New Work log,
fixed zero effective hash rate in Periodic Report log,
deleted "Current block is..." log.
Renamed stratum "New Job" log to "New Work" to be consistent with the solo
version of the log. Added more data to both versions.
v3.14.0 v3.14.0
Changes to solo mining: Changes to solo mining:

20
configure vendored
View File

@@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for cpuminer-opt 3.14.0. # Generated by GNU Autoconf 2.69 for cpuminer-opt 3.14.1.
# #
# #
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='cpuminer-opt' PACKAGE_NAME='cpuminer-opt'
PACKAGE_TARNAME='cpuminer-opt' PACKAGE_TARNAME='cpuminer-opt'
PACKAGE_VERSION='3.14.0' PACKAGE_VERSION='3.14.1'
PACKAGE_STRING='cpuminer-opt 3.14.0' PACKAGE_STRING='cpuminer-opt 3.14.1'
PACKAGE_BUGREPORT='' PACKAGE_BUGREPORT=''
PACKAGE_URL='' PACKAGE_URL=''
@@ -1332,7 +1332,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures cpuminer-opt 3.14.0 to adapt to many kinds of systems. \`configure' configures cpuminer-opt 3.14.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1404,7 +1404,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of cpuminer-opt 3.14.0:";; short | recursive ) echo "Configuration of cpuminer-opt 3.14.1:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@@ -1509,7 +1509,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
cpuminer-opt configure 3.14.0 cpuminer-opt configure 3.14.1
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2012,7 +2012,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by cpuminer-opt $as_me 3.14.0, which was It was created by cpuminer-opt $as_me 3.14.1, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
@@ -2993,7 +2993,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='cpuminer-opt' PACKAGE='cpuminer-opt'
VERSION='3.14.0' VERSION='3.14.1'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@@ -6690,7 +6690,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by cpuminer-opt $as_me 3.14.0, which was This file was extended by cpuminer-opt $as_me 3.14.1, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@@ -6756,7 +6756,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
cpuminer-opt config.status 3.14.0 cpuminer-opt config.status 3.14.1
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

2
configure.ac
View File

@@ -1,4 +1,4 @@
AC_INIT([cpuminer-opt], [3.14.0]) AC_INIT([cpuminer-opt], [3.14.1])
AC_PREREQ([2.59c]) AC_PREREQ([2.59c])
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM

34
cpu-miner.c
View File

@@ -2,8 +2,8 @@
* Copyright 2010 Jeff Garzik * Copyright 2010 Jeff Garzik
* Copyright 2012-2014 pooler * Copyright 2012-2014 pooler
* Copyright 2014 Lucas Jones * Copyright 2014 Lucas Jones
* Copyright 2014 Tanguy Pruvot * Copyright 2014-2016 Tanguy Pruvot
* Copyright 2016 Jay D Dee * Copyright 2016-2020 Jay D Dee
* *
* This program is free software; you can redistribute it and/or modify it * 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 * under the terms of the GNU General Public License as published by the Free
@@ -603,7 +603,6 @@ static bool gbt_work_decode( const json_t *val, struct work *work )
goto out; goto out;
} }
work->height = (int) json_integer_value( tmp ); work->height = (int) json_integer_value( tmp );
applog( LOG_BLUE, "Current block is %d", work->height );
tmp = json_object_get(val, "version"); tmp = json_object_get(val, "version");
if ( !tmp || !json_is_integer( tmp ) ) if ( !tmp || !json_is_integer( tmp ) )
@@ -1569,7 +1568,7 @@ start:
json_decref( val ); json_decref( val );
get_mininginfo( curl, work ); get_mininginfo( curl, work );
report_summary_log( false ); report_summary_log( false );
if ( opt_protocol | opt_debug ) if ( opt_protocol | opt_debug )
{ {
@@ -1582,13 +1581,16 @@ start:
if ( work->height > last_block_height ) if ( work->height > last_block_height )
{ {
last_block_height = work->height; last_block_height = work->height;
applog( LOG_BLUE, "New Block %d, Net Diff %.5g, Ntime %08x", last_targetdiff = net_diff;
work->height, net_diff,
bswap_32( work->data[ algo_gate.ntime_index ] ) );
if ( !opt_quiet && net_diff && ( net_hashrate > 0. ) ) applog( LOG_BLUE, "New Block %d, Net Diff %.5g, Ntime %08x",
work->height, net_diff,
work->data[ algo_gate.ntime_index ] );
if ( !opt_quiet && ( net_diff > 0. ) && ( net_hashrate > 0. ) )
{ {
double miner_hr = 0.; double miner_hr = 0.;
pthread_mutex_lock( &stats_lock ); pthread_mutex_lock( &stats_lock );
for ( int i = 0; i < opt_n_threads; i++ ) for ( int i = 0; i < opt_n_threads; i++ )
@@ -1611,14 +1613,15 @@ start:
scale_hash_for_display ( &net_hr, net_hr_units ); scale_hash_for_display ( &net_hr, net_hr_units );
applog2( LOG_INFO, applog2( LOG_INFO,
"Miner TTF @ %.2f %sh/s %s, Net TTF @ %.2f %sh/s %s", "Miner TTF @ %.2f %sh/s %s, Net TTF @ %.2f %sh/s %s",
miner_hr, miner_hr_units, miner_ttf, miner_hr, miner_hr_units, miner_ttf, net_hr,
net_hr, net_hr_units, net_ttf ); net_hr_units, net_ttf );
} }
} }
} // work->height > last_block_height } // work->height > last_block_height
else if ( memcmp( &work->data[1], &g_work.data[1], 32 ) ) else if ( memcmp( &work->data[1], &g_work.data[1], 32 ) )
applog( LOG_BLUE, "New Work, Ntime %08lx", applog( LOG_BLUE, "New Work: Block %d, Net Diff %.5g, Ntime %08x",
bswap_32( work->data[ algo_gate.ntime_index ] ) ); work->height, net_diff,
work->data[ algo_gate.ntime_index ] );
} // rc } // rc
return rc; return rc;
@@ -2018,13 +2021,14 @@ static void stratum_gen_work( struct stratum_ctx *sctx, struct work *g_work )
pthread_mutex_unlock( &stats_lock ); pthread_mutex_unlock( &stats_lock );
if ( stratum_diff != sctx->job.diff ) if ( stratum_diff != sctx->job.diff )
applog( LOG_BLUE, "New Diff %g, Block %d, Job %s", applog( LOG_BLUE, "New Stratum Diff %g, Block %d, Job %s",
sctx->job.diff, sctx->block_height, g_work->job_id ); sctx->job.diff, sctx->block_height, g_work->job_id );
else if ( last_block_height != sctx->block_height ) else if ( last_block_height != sctx->block_height )
applog( LOG_BLUE, "New Block %d, Job %s", applog( LOG_BLUE, "New Block %d, Job %s",
sctx->block_height, g_work->job_id ); sctx->block_height, g_work->job_id );
else if ( g_work->job_id ) else if ( g_work->job_id )
applog( LOG_BLUE,"New Job %s", g_work->job_id ); applog( LOG_BLUE, "New Work: Block %d, Net diff %.5g, Job %s",
sctx->block_height, net_diff, g_work->job_id );
// Update data and calculate new estimates. // Update data and calculate new estimates.
if ( ( stratum_diff != sctx->job.diff ) if ( ( stratum_diff != sctx->job.diff )
@@ -2068,10 +2072,8 @@ static void stratum_gen_work( struct stratum_ctx *sctx, struct work *g_work )
if ( net_diff && net_ttf ) if ( net_diff && net_ttf )
{ {
double net_hr = net_diff * exp32 / net_ttf; double net_hr = net_diff * exp32 / net_ttf;
// char net_ttf_str[32];
char net_hr_units[4] = {0}; char net_hr_units[4] = {0};
// sprintf_et( net_ttf_str, net_ttf );
scale_hash_for_display ( &net_hr, net_hr_units ); scale_hash_for_display ( &net_hr, net_hr_units );
applog2( LOG_INFO, "Net hash rate (est) %.2f %sh/s", applog2( LOG_INFO, "Net hash rate (est) %.2f %sh/s",
net_hr, net_hr_units ); net_hr, net_hr_units );