RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

copy: fix race on shutdown

This commit is contained in:
Thomas Schoebel-Theuer 2019-01-31 20:31:38 +01:00 committed by Thomas Schoebel-Theuer
parent 5ad1645de9
commit a6fbb93394
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kernel/mars_copy.c
View File

@ -867,7 +867,7 @@ static int _copy_thread(void *data)
brick->copy_end); brick->copy_end);
_clear_all_mref(brick); _clear_all_mref(brick);
mars_power_led_off((void*)brick, true); brick->terminated = true;
MARS_DBG("--------------- copy_thread done.\n"); MARS_DBG("--------------- copy_thread done.\n");
return 0; return 0;
} }
@ -921,20 +921,22 @@ static int copy_switch(struct copy_brick *brick)
static int version = 0; static int version = 0;
MARS_DBG("power.button = %d\n", brick->power.button); MARS_DBG("power.button = %d\n", brick->power.button);
if (brick->power.button) { if (brick->power.button && !brick->terminated) {
if (brick->power.led_on) if (brick->power.led_on || brick->thread)
goto done; goto done;
mars_power_led_off((void*)brick, false); mars_power_led_off((void*)brick, false);
mars_power_led_on((void*)brick, true);
brick->is_aborting = false; brick->is_aborting = false;
if (!brick->thread) { if (!brick->thread) {
brick->copy_last = brick->copy_start; brick->copy_last = brick->copy_start;
brick->copy_dirty = 0; brick->copy_dirty = 0;
brick->terminated = false;
mars_power_led_on((void*)brick, true);
get_lamport(NULL, &brick->copy_last_stamp); get_lamport(NULL, &brick->copy_last_stamp);
brick->thread = brick_thread_create(_copy_thread, brick, "mars_copy%d", version++); brick->thread = brick_thread_create(_copy_thread, brick, "mars_copy%d", version++);
if (brick->thread) { if (brick->thread) {
brick->trigger = true; brick->trigger = true;
} else { } else {
mars_power_led_on((void*)brick, false);
mars_power_led_off((void*)brick, true); mars_power_led_off((void*)brick, true);
MARS_ERR("could not start copy thread\n"); MARS_ERR("could not start copy thread\n");
} }
@ -944,13 +946,14 @@ static int copy_switch(struct copy_brick *brick)
mars_power_led_on((void*)brick, false); mars_power_led_on((void*)brick, false);
if (brick->thread) { if (brick->thread) {
/* Notice: this will be reported by the thread */ /* Notice: this will be reported by the thread */
if (brick->power.led_off) if (!brick->terminated)
goto done; goto done;
MARS_INF("stopping thread...\n"); MARS_INF("stopping thread...\n");
brick_thread_stop(brick->thread); brick_thread_stop(brick->thread);
} }
/* for safety, and when the thread was not started */ /* for safety, and when the thread was not started */
mars_power_led_off((void*)brick, true); mars_power_led_off((void*)brick, true);
brick->terminated = false;
} }
done: done:
return 0; return 0;

1
kernel/mars_copy.h
View File

@ -98,6 +98,7 @@ struct copy_brick {
bool is_aborting; bool is_aborting;
// internal // internal
bool trigger; bool trigger;
bool terminated;
unsigned long clash; unsigned long clash;
atomic_t total_clash_count; atomic_t total_clash_count;
atomic_t io_flight; atomic_t io_flight;