shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

Tidy some comments/messages.

Browse Source
This commit is contained in:
Alasdair Kergon 2006-01-27 20:52:21 +00:00
parent 1ff0ef6945
commit db204c51a6
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
daemons/dmeventd/dmeventd.c
View File

@ -32,7 +32,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <syslog.h>
#include <sys/file.h> #include <sys/file.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/types.h> #include <sys/types.h>
@ -329,7 +328,7 @@ static int device_exists(char *device)
/* /*
* Find an existing thread for a device. * Find an existing thread for a device.
* *
* Mutex must be hold when calling this. * Mutex must be held when calling this.
*/ */
static struct thread_status *lookup_thread_status(struct message_data *data) static struct thread_status *lookup_thread_status(struct message_data *data)
{ {
@ -587,7 +586,7 @@ static void *monitor_thread(void *arg)
pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL); pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
pthread_cleanup_push(monitor_unregister, thread); pthread_cleanup_push(monitor_unregister, thread);
/* Wait for do_process_reques() to finish its task. */ /* Wait for do_process_request() to finish its task. */
lock_mutex(); lock_mutex();
unlock_mutex(); unlock_mutex();
@ -595,6 +594,11 @@ static void *monitor_thread(void *arg)
while (1) { while (1) {
thread->current_events = 0; thread->current_events = 0;
/*
* FIXME: if unrecoverable error (ENODEV) happens,
* we loop indefinitely. event_wait should return
* more than 0/1.
*/
if (!event_wait(thread)) if (!event_wait(thread))
continue; continue;
@ -605,6 +609,10 @@ static void *monitor_thread(void *arg)
* the device got registered for those events AND * the device got registered for those events AND
* those events haven't been processed yet, call * those events haven't been processed yet, call
* the DSO's process_event() handler. * the DSO's process_event() handler.
*
* FIXME: when does processed_events get cleared? What if
* the same type of event happens later... after the first
* was handled properly?
*/ */
if (thread->events & if (thread->events &
thread->current_events & thread->current_events &
@ -1131,7 +1139,6 @@ static int do_process_request(struct dm_event_daemon_message *msg)
stack; stack;
ret = -EINVAL; ret = -EINVAL;
} else { } else {
log_print("%s: %u \"%s\"\n", __func__, msg->opcode.cmd, message_data.msg->msg);
ret = handle_request(msg, &message_data); ret = handle_request(msg, &message_data);
} }
@ -1156,7 +1163,6 @@ static void process_request(struct dm_event_fifos *fifos)
msg.opcode.status = do_process_request(&msg); msg.opcode.status = do_process_request(&msg);
log_print("%s: status: %s\n", __func__, strerror(-msg.opcode.status));
if (!client_write(fifos, &msg)) if (!client_write(fifos, &msg))
stack; stack;
} }

1
daemons/dmeventd/libdevmapper-event.c
View File

@ -232,7 +232,6 @@ static int start_daemon(void)
sleep(1); sleep(1);
if (daemon_running) { if (daemon_running) {
log_print("dmeventd started.\n");
ret = 1; ret = 1;
} else { } else {
switch (WEXITSTATUS(status)) { switch (WEXITSTATUS(status)) {