dcrubro/skalacoin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

segfault fix

Browse Source
This commit is contained in:
DcruBro
2026-05-15 19:46:57 +02:00
parent 971a4d9e49
commit 8f3559b3f6
1 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/main.c
View File

@@ -828,33 +828,8 @@ int main(int argc, char* argv[]) {
break; break;
} }
requestedHeights[inFlight] = req;
uint64_t newLocal = (uint64_t)Chain_Size(chain); retryCount[inFlight] = 0;
if (newLocal > localHeight) madeProgressOverall = true;
printf("sync complete: localHeight=%" PRIu64 "\n", newLocal);
// If we've caught up to the peer, stop. Otherwise refresh peerHeight and loop again.
if (newLocal >= peerHeight) break;
// Refresh advertised peer height for this connection (it may have been updated during fetch)
pthread_mutex_lock(&node->outboundLock);
for (size_t i = 0; i < MAX_CONS; ++i) {
if (node->outboundClients[i].connection == peerConn) {
peerHeight = node->outboundClients[i].peerBlockHeight;
break;
}
}
pthread_mutex_unlock(&node->outboundLock);
// If no progress was made in this iteration, stop to avoid tight loop
if (!madeProgressOverall) {
break;
}
// Re-evaluate loop condition: continue while local < peerHeight
if ((uint64_t)Chain_Size(chain) >= peerHeight) break;
}
sentAtMs[inFlight] = get_current_time_ms(); sentAtMs[inFlight] = get_current_time_ms();
inFlight++; inFlight++;
nextReq++; nextReq++;
@@ -1001,7 +976,31 @@ int main(int argc, char* argv[]) {
} }
} }
printf("sync complete: localHeight=%zu\n", Chain_Size(chain)); // After the window completes, check progress and possibly refresh peer height
uint64_t newLocal = (uint64_t)Chain_Size(chain);
if (newLocal > localHeight) madeProgressOverall = true;
printf("sync complete: localHeight=%" PRIu64 "\n", newLocal);
// If we've caught up to the peer, stop. Otherwise refresh peerHeight and loop again.
if (newLocal >= peerHeight) break;
// Refresh advertised peer height for this connection (it may have been updated during fetch)
pthread_mutex_lock(&node->outboundLock);
for (size_t i = 0; i < MAX_CONS; ++i) {
if (node->outboundClients[i].connection == peerConn) {
peerHeight = node->outboundClients[i].peerBlockHeight;
break;
}
}
pthread_mutex_unlock(&node->outboundLock);
// If no progress was made in this iteration, stop to avoid tight loop
if (!madeProgressOverall) {
break;
}
// Re-evaluate loop condition: continue while local < peerHeight
if ((uint64_t)Chain_Size(chain) >= peerHeight) break;
continue; continue;
} }
@@ -1183,6 +1182,8 @@ int main(int argc, char* argv[]) {
printf("Unknown command. Available: mine, send, balance, connect, flushchain, fullverify, blockdetail, wipechain, genaddr, exit\n"); printf("Unknown command. Available: mine, send, balance, connect, flushchain, fullverify, blockdetail, wipechain, genaddr, exit\n");
} }
}
(void)FlushChainAndSheet(chain, chainDataDir, currentSupply, currentReward); (void)FlushChainAndSheet(chain, chainDataDir, currentSupply, currentReward);
Block_ShutdownPowContext(); Block_ShutdownPowContext();