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

import mars-69.tgz

This commit is contained in:
Thomas Schoebel-Theuer 2011-03-03 19:23:34 +01:00
parent bbff01d71f
commit 4c4f0a8691
4 changed files with 49 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
mars_client.c
View File

@ -265,15 +265,19 @@ static int receiver_thread(void *data)
}
done:
if (status < 0)
if (status < 0) {
MARS_ERR("receiver thread terminated with status = %d\n", status);
output->receiver.thread = NULL;
}
#if 0
if (output->socket) {
MARS_INF("shutting down socket\n");
kernel_sock_shutdown(output->socket, SHUT_WR);
msleep(1000);
output->socket = NULL;
}
#endif
output->receiver.terminated = true;
wake_up_interruptible(&output->receiver.run_event);
return status;
}
@ -298,17 +302,6 @@ static int sender_thread(void *data)
do_resubmit = true;
}
if (unlikely(!output->receiver.thread)) {
output->receiver.thread = kthread_create(receiver_thread, output, "mars_receiver%d", thread_count++);
if (unlikely(IS_ERR(output->receiver.thread))) {
MARS_ERR("cannot start receiver thread, status = %d\n", (int)PTR_ERR(output->receiver.thread));
output->receiver.thread = NULL;
msleep(5000);
continue;
}
wake_up_process(output->receiver.thread);
}
if (do_resubmit) {
/* Re-Submit any waiting requests
*/
@ -327,6 +320,19 @@ static int sender_thread(void *data)
wait_event_interruptible_timeout(output->event, !list_empty(&output->mref_list), 1 * HZ);
if (unlikely(output->receiver.terminated)) {
output->receiver.terminated = false;
output->receiver.thread = kthread_create(receiver_thread, output, "mars_receiver%d", thread_count++);
if (unlikely(IS_ERR(output->receiver.thread))) {
MARS_ERR("cannot start receiver thread, status = %d\n", (int)PTR_ERR(output->receiver.thread));
output->receiver.thread = NULL;
output->receiver.terminated = true;
msleep(5000);
continue;
}
wake_up_process(output->receiver.thread);
}
if (list_empty(&output->mref_list))
continue;
@ -351,10 +357,8 @@ static int sender_thread(void *data)
_kill_socket(output);
_kill_thread(&output->receiver);
/* Forcibly mark as dead, in any case.
* In consequence, a new connection will be tried thereafter.
*/
output->receiver.thread = NULL;
wait_event_interruptible_timeout(output->receiver.run_event, output->receiver.terminated, 10 * HZ);
continue;
}
}
@ -365,7 +369,8 @@ static int sender_thread(void *data)
_kill_socket(output);
_kill_thread(&output->receiver);
output->sender.thread = NULL;
output->sender.terminated = true;
wake_up_interruptible(&output->sender.run_event);
return status;
}
@ -376,19 +381,28 @@ static int client_switch(struct client_brick *brick)
if (brick->power.button) {
mars_power_led_off((void*)brick, false);
output->sender.thread = kthread_create(sender_thread, output, "mars_sender%d", thread_count++);
if (unlikely(IS_ERR(output->sender.thread))) {
status = PTR_ERR(output->sender.thread);
MARS_ERR("cannot start sender thread, status = %d\n", status);
output->sender.thread = NULL;
goto done;
if (output->sender.terminated) {
output->sender.terminated = false;
output->sender.thread = kthread_create(sender_thread, output, "mars_sender%d", thread_count++);
if (unlikely(IS_ERR(output->sender.thread))) {
status = PTR_ERR(output->sender.thread);
MARS_ERR("cannot start sender thread, status = %d\n", status);
output->sender.thread = NULL;
output->sender.terminated = true;
goto done;
}
}
wake_up_process(output->sender.thread);
mars_power_led_on((void*)brick, true);
if (!output->sender.terminated) {
mars_power_led_on((void*)brick, true);
}
} else {
mars_power_led_on((void*)brick, false);
_kill_thread(&output->sender);
mars_power_led_off((void*)brick, !output->sender.thread);
wait_event_interruptible_timeout(output->sender.run_event, output->sender.terminated, 10 * HZ);
if (output->sender.terminated) {
mars_power_led_off((void*)brick, !output->sender.thread);
}
}
done:
return status;
@ -425,9 +439,11 @@ static int client_output_construct(struct client_output *output)
INIT_LIST_HEAD(&output->mref_list);
INIT_LIST_HEAD(&output->wait_list);
init_waitqueue_head(&output->event);
init_waitqueue_head(&output->sender.event);
init_waitqueue_head(&output->receiver.event);
init_waitqueue_head(&output->sender.run_event);
init_waitqueue_head(&output->receiver.run_event);
init_waitqueue_head(&output->info_event);
output->sender.terminated = true;
output->receiver.terminated = true;
return 0;
}

3
mars_client.h
View File

@ -20,7 +20,8 @@ struct client_input {
struct client_threadinfo {
struct task_struct *thread;
wait_queue_head_t event;
wait_queue_head_t run_event;
bool terminated;
};
struct client_output {

4
mars_if_device.c
View File

@ -540,7 +540,7 @@ static void __exit exit_if_device(void)
int status;
MARS_INF("exit_if_device()\n");
status = if_device_unregister_brick_type();
unregister_blkdev(DRBD_MAJOR, "mars");
unregister_blkdev(MARS_MAJOR, "mars");
}
static int __init init_if_device(void)
@ -550,7 +550,7 @@ static int __init init_if_device(void)
(void)if_device_aspect_types; // not used, shut up gcc
MARS_INF("init_if_device()\n");
status = register_blkdev(DRBD_MAJOR, "mars");
status = register_blkdev(MARS_MAJOR, "mars");
if (status)
return status;
status = if_device_register_brick_type();

2
userspace/marsadm
View File

@ -60,7 +60,7 @@ sub get_size {
# helpers
sub _trigger {
system("echo 1 > /proc/sys/mars 2>/dev/null");
system("modprobe mars_proc; (echo 1 > /proc/sys/mars) >/dev/null 2>&1");
}
sub _switch {