Initialization logic is rewritten #476
Conversation
jonano614
commented
Dec 6, 2018
- xdag_init function is splitted to logical parts
- some global varibales are moved to global.h file
- variables g_is_miner, g_is_pool, g_xdag_pool and g_light_mode are replaces with one variable g_xdag_type
- dnet_crypt.c file is formatted, some reduntunt lines are remove
- reading dnet key is moved to separate function
- preparations for adding single wallet file "xdag.wallet"
- windows-compilation and formatting for PR: Config file for pools #461
client/block.c
Outdated
| @@ -839,7 +839,7 @@ void *add_block_callback(void *block, void *data) | |||
|
|
|||
| pthread_mutex_unlock(&block_mutex); | |||
|
|
|||
| if(res >= 0) { | |||
| if(res >= 0 && g_xdag_type == XDAG_POOL) { | |||
There was a problem hiding this comment.
Blocks synchronization logic is initialized only for pools now, so xdag_sync_pop_block can be called only for pools
# Conflicts: # client/commands.c # client/init.h
| @@ -1194,15 +1194,6 @@ static void *work_thread(void *arg) | |||
| } else if (time(NULL) - last_time_nmain_unequal > MAX_TIME_NMAIN_STALLED) { | |||
| g_block_production_on = 1; | |||
| } | |||
|
|
|||
| if (g_block_production_on) { | |||
There was a problem hiding this comment.
Do we need remove these logs?
There was a problem hiding this comment.
We don't need this code block for pool at all. Maybe I just move xdag_mess("Starting refer blocks creation..."); to another place.
client/commands.c
Outdated
| @@ -331,7 +332,7 @@ int xdag_command(char *cmd, FILE *out) | |||
|
|
|||
| XDAG_COMMAND *command = find_xdag_command(cmd); | |||
|
|
|||
| if(!command || (command->avaibility == 1 && !g_is_miner) || (command->avaibility == 2 && g_is_miner)) { | |||
| if(!command || (command->avaibility == 1 && g_xdag_type == XDAG_POOL) || (command->avaibility == 2 && g_xdag_type == XDAG_WALLET)) { | |||
There was a problem hiding this comment.
Maybe just use two functions
isPool() {
return g_xdag_type == XDAG_POOL;
}
isWallet() {
return g_xdag_type == XDAG_WALLET;
}
There was a problem hiding this comment.
Good point. I will add it.
client/global.c
Outdated
| struct xdag_ext_stats g_xdag_extstats; | ||
| int g_disable_mining = 0; | ||
| enum xdag_type g_xdag_type = 0; | ||
| char *g_coinname, *g_progname; |
There was a problem hiding this comment.
Emmm, there is one extra character on windows.
There was a problem hiding this comment.
Sorry, I didn't understand what is wrong here.
| @@ -38,6 +38,7 @@ int terminal(void) | |||
|
|
|||
| if(!xdag_network_init()) { | |||
| printf("Can't initialize sockets"); | |||
| return -1; | |||
| } | ||
| } | ||
| return str; | ||
| if(str != NULL) { |
There was a problem hiding this comment.
trim can be moved to utils, or we can introduce a file strutils.c to hold all related functions.
There was a problem hiding this comment.
Well, currently there is just formatting. I had to do something wih that file because there was compilation error. I fixed a problem and decided to do formatting too.
| @@ -66,4 +66,7 @@ extern int g_disable_mining; | |||
| //Test network and main network have different types of the block headers, so blocks from different networks are incompatible | |||
| extern enum xdag_field_type g_block_header_type; | |||
|
|
|||
| inline int is_pool() { return g_xdag_type == XDAG_POOL; } | |||
| inline int is_wallet() { return g_xdag_type == XDAG_WALLET; } | |||
There was a problem hiding this comment.
i think you are missing void :)