1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-14 04:59:04 +03:00

o Build dmeventd against multilog

This commit is contained in:
AJ Lewis 2005-04-28 22:47:52 +00:00
parent c9dcd7442a
commit ab8bdc18bb
3 changed files with 14 additions and 13 deletions

View File

@ -1,3 +1,3 @@
process_event
register_device
unregister_device
unregister_device

View File

@ -36,11 +36,11 @@ libdmeventnoop.so: noop.o
dmevent: dmevent.o $(interfacedir)/libdevmapper.$(LIB_SUFFIX) $(top_srcdir)/lib/event/libdmevent.$(LIB_SUFFIX)
$(CC) -o $@ dmevent.o $(LDFLAGS) \
-L$(interfacedir) -L$(DESTDIR)/lib -L$(top_srcdir)/lib/event -ldevmapper -ldmevent $(LIBS)
-L$(interfacedir) -L$(DESTDIR)/lib -L$(top_srcdir)/lib/event -L$(top_srcdir)/multilog -lmultilog -ldmevent $(LIBS)
dmeventd: dmeventd.o $(interfacedir)/libdevmapper.$(LIB_SUFFIX) $(top_srcdir)/lib/event/libdmevent.$(LIB_SUFFIX)
$(CC) -o $@ dmeventd.o $(LDFLAGS) \
-L$(interfacedir) -L$(DESTDIR)/lib -L$(top_srcdir)/lib/event -ldevmapper -ldmevent $(LIBS)
-L$(interfacedir) -L$(DESTDIR)/lib -L$(top_srcdir)/lib/event -L$(top_srcdir)/multilog -ldmevent -lmultilog $(LIBS)
install: $(INSTALL_TYPE)

View File

@ -22,6 +22,7 @@
#include "log.h"
#include "libdm-event.h"
#include "list.h"
#include "libmultilog.h"
#include <dlfcn.h>
#include <errno.h>
@ -41,16 +42,6 @@
#include <sys/wait.h>
#include <unistd.h>
/*
* Macros to be moved external later...
*/
#undef log_print
#undef log_err
#undef stack
#define log_print(x...) fprintf(stdout, "[dmeventd] " x)
#define log_err(x...) fprintf(stderr, "ERROR: " x)
#define stack log_print("trace: %s:%s(%d)\n", \
__FILE__, __func__, __LINE__);
#define dbg_malloc(x...) malloc(x)
#define dbg_strdup(x...) strdup(x)
@ -964,6 +955,7 @@ int main(void)
{
int ret = 0;
struct fifos fifos;
pthread_t log_thread = {0};
switch (daemonize()) {
case 1: /* Child. */
@ -975,6 +967,15 @@ int main(void)
init_thread_signals();
kill(getppid(), SIGHUP);
/* Startup the syslog thread now so log_* macros work */
if(!start_syslog_thread(&log_thread, 100)) {
fprintf(stderr, "Could not start logging thread\n");
munlockall();
pthread_mutex_destroy(&mutex);
break;
}
init_fifos(&fifos);
pthread_mutex_init(&mutex, NULL);