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

Fix possible config issue

Browse Source 
Fixing a possible problem where loading default profile would override global level options.
This commit is contained in:
ystarnaud 2014-06-23 05:17:07 -04:00
parent 416c6b68bf
commit 3a728e65fb
1 changed files with 51 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
config_parser.c
View File

@ -673,40 +673,65 @@ void load_default_config(void)
// assign default settings from default profile if set // assign default settings from default profile if set
void load_default_profile() void load_default_profile()
{ {
applog(LOG_DEBUG, "default_profile.name is %s", default_profile.name);
if (empty_string(default_profile.name))
{
applog(LOG_WARNING, "Default profile name is not set.");
return;
}
struct profile *profile; struct profile *profile;
if (empty_string(default_profile.name))
return;
applog(LOG_DEBUG, "default_profile.name is %s", default_profile.name);
// find profile ... // find profile ...
profile = get_profile(default_profile.name); if(!(profile = get_profile(default_profile.name)))
if (!profile) { {
applog(LOG_WARNING, "Could not load default profile %s", applog(LOG_WARNING, "Could not load default profile %s", default_profile.name);
default_profile.name);
return; return;
} }
// ... and copy settings // ... and copy settings
default_profile.algorithm = profile->algorithm; if(!empty_string(profile->algorithm.name))
set_algorithm(&default_profile.algorithm, profile->algorithm.name);
if(!empty_string(profile->devices))
default_profile.devices = profile->devices; default_profile.devices = profile->devices;
if(!empty_string(profile->lookup_gap))
default_profile.lookup_gap = profile->lookup_gap; default_profile.lookup_gap = profile->lookup_gap;
if(!empty_string(profile->intensity))
default_profile.intensity = profile->intensity; default_profile.intensity = profile->intensity;
if(!empty_string(profile->xintensity))
default_profile.xintensity = profile->xintensity; default_profile.xintensity = profile->xintensity;
if(!empty_string(profile->rawintensity))
default_profile.rawintensity = profile->rawintensity; default_profile.rawintensity = profile->rawintensity;
if(!empty_string(profile->thread_concurrency))
default_profile.thread_concurrency = profile->thread_concurrency; default_profile.thread_concurrency = profile->thread_concurrency;
#ifdef HAVE_ADL #ifdef HAVE_ADL
if(!empty_string(profile->gpu_engine))
default_profile.gpu_engine = profile->gpu_engine; default_profile.gpu_engine = profile->gpu_engine;
if(!empty_string(profile->gpu_memclock))
default_profile.gpu_memclock = profile->gpu_memclock; default_profile.gpu_memclock = profile->gpu_memclock;
if(!empty_string(profile->gpu_threads))
default_profile.gpu_threads = profile->gpu_threads; default_profile.gpu_threads = profile->gpu_threads;
if(!empty_string(profile->gpu_fan))
default_profile.gpu_fan = profile->gpu_fan; default_profile.gpu_fan = profile->gpu_fan;
if(!empty_string(profile->gpu_powertune))
default_profile.gpu_powertune = profile->gpu_powertune; default_profile.gpu_powertune = profile->gpu_powertune;
if(!empty_string(profile->gpu_vddc))
default_profile.gpu_vddc = profile->gpu_vddc; default_profile.gpu_vddc = profile->gpu_vddc;
#endif #endif
if(!empty_string(profile->shaders))
default_profile.shaders = profile->shaders; default_profile.shaders = profile->shaders;
if(!empty_string(profile->worksize))
default_profile.worksize = profile->worksize; default_profile.worksize = profile->worksize;
} }