Ma/mscp
1
0
Fork 0
mirror of https://github.com/upa/mscp.git synced 2026-03-16 05:17:35 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix some thread handling

Browse Source
This commit is contained in:
Ryo Nakamura
2022-11-12 16:11:20 +09:00
parent 73e884f9c5
commit 71d827d613
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main.c
View File

@@ -66,7 +66,8 @@ void stop_copy_threads(int sig)
pr("stopping...\n"); pr("stopping...\n");
for (n = 0; n < nr_threads; n++) { for (n = 0; n < nr_threads; n++) {
pthread_cancel(threads[n].tid); if (!threads[n].finished)
pthread_cancel(threads[n].tid);
} }
} }
@@ -323,13 +324,6 @@ int main(int argc, char **argv)
if (dryrun) if (dryrun)
return 0; return 0;
/* register SIGINT to stop thrads */
if (signal(SIGINT, stop_copy_threads) == SIG_ERR) {
pr_err("cannot set signal: %s\n", strerrno());
ret = 1;
goto out;
}
/* prepare thread instances */ /* prepare thread instances */
if ((n = list_count(&m.chunk_list)) < nr_threads) { if ((n = list_count(&m.chunk_list)) < nr_threads) {
pprint3("we have only %d chunk(s). set nr_conns to %d\n", n, n); pprint3("we have only %d chunk(s). set nr_conns to %d\n", n, n);
@@ -359,6 +353,13 @@ int main(int argc, char **argv)
goto join_out; goto join_out;
} }
/* register SIGINT to stop threads */
if (signal(SIGINT, stop_copy_threads) == SIG_ERR) {
pr_err("cannot set signal: %s\n", strerrno());
ret = 1;
goto out;
}
/* save start time */ /* save start time */
gettimeofday(&m.start, NULL); gettimeofday(&m.start, NULL);
@@ -521,7 +522,7 @@ static void print_progress(struct timeval *start, struct timeval *end,
byte_du++) byte_du++)
done_round /= 1024; done_round /= 1024;
snprintf(suffix, sizeof(suffix), "%lu%s/%lu%s %.2f%s ", snprintf(suffix, sizeof(suffix), "%lu%s/%lu%s %6.1f%s ",
done_round, byte_units[byte_du], total_round, byte_units[byte_tu], done_round, byte_units[byte_du], total_round, byte_units[byte_tu],
bps, bps_units[bps_u]); bps, bps_units[bps_u]);
@@ -582,7 +583,7 @@ void *mscp_monitor_thread(void *arg)
} }
gettimeofday(&b, NULL); gettimeofday(&b, NULL);
usleep(500000); usleep(1000000);
for (n = 0; n < nr_threads; n++) { for (n = 0; n < nr_threads; n++) {
done += threads[n].done; done += threads[n].done;