From 073c2108143d263319d58f50634b3ef86398243d Mon Sep 17 00:00:00 2001 From: H Hautakoski Date: Wed, 8 Sep 2010 19:53:15 +0200 Subject: [PATCH] Moving some files and cleaning up. --- Makefile | 23 +++++------ src/arch.c | 2 +- src/indexer.c | 4 +- src/{fs/notify_event.c => notify/event.c} | 4 +- src/{fs/notify_event.h => notify/event.h} | 9 ++--- src/{fs/notify_inotify.c => notify/inotify.c} | 2 +- src/{fs => notify}/notify.h | 10 ++--- src/{fs => notify}/queue.c | 2 +- src/{fs => notify}/queue.h | 8 ++-- src/{fs => notify}/tree.c | 2 +- src/{fs => notify}/tree.h | 9 ++--- test/Makefile | 40 ++++++++++--------- test/t_inotify.c | 4 +- test/t_queue.c | 2 +- test/{raw_inotify.c => t_raw_inotify.c} | 0 test/t_tree.c | 2 +- 16 files changed, 62 insertions(+), 61 deletions(-) rename src/{fs/notify_event.c => notify/event.c} (96%) rename src/{fs/notify_event.h => notify/event.h} (89%) rename src/{fs/notify_inotify.c => notify/inotify.c} (99%) mode change 100755 => 100644 rename src/{fs => notify}/notify.h (82%) mode change 100755 => 100644 rename src/{fs => notify}/queue.c (99%) rename src/{fs => notify}/queue.h (88%) rename src/{fs => notify}/tree.c (98%) rename src/{fs => notify}/tree.h (87%) rename test/{raw_inotify.c => t_raw_inotify.c} (100%) diff --git a/Makefile b/Makefile index 9c28b38..5be6660 100644 --- a/Makefile +++ b/Makefile @@ -9,24 +9,23 @@ #DB_NAME := dbname #DB_TBL := dbtable -ifdef DEBUG -CFLAGS := -g -DEFS := -D__DEBUG__ -endif - -LIBS := `mysql_config --libs` -CFLAGS := -Werror $(LIBS) $(DEFS) CC := gcc +CFLAGS := -Werror `mysql_config --cflags` +LDFLAGS := -L/usr/lib/mysql -lmysqlclient + +ifdef DEBUG +CFLAGS += -g -D__DEBUG__ +endif SOURCES := \ src/arch.c \ - src/arch/mysql.c \ + src/arch/mysql.c \ src/indexer.c \ src/common/path.c \ src/common/rbtree.c \ - src/fs/notify_inotify.c \ - src/fs/notify_event.c \ - src/fs/tree.c + src/notify/inotify.c \ + src/notify/event.c \ + src/notify/tree.c BUILD := ./build @@ -37,7 +36,7 @@ ifdef DB_HOST else @echo "Tip: edit this Makefile DB_* macros to enable generation of a wrapper shellscript" endif - $(CC) $(CFLAGS) $(SOURCES) -o $(BUILD)/arch + $(CC) $(CFLAGS) $(LDFLAGS) $(SOURCES) -o $(BUILD)/arch wrapper : @echo "#!/bin/sh" > $(BUILD)/wrapper diff --git a/src/arch.c b/src/arch.c index b7f8045..2a10a4b 100644 --- a/src/arch.c +++ b/src/arch.c @@ -3,7 +3,7 @@ #include #include #include "arch/db.h" -#include "fs/notify.h" +#include "notify/notify.h" /* only way to exit the application properly when in main loop is by signal */ diff --git a/src/indexer.c b/src/indexer.c index c7ade83..e0a5c0d 100644 --- a/src/indexer.c +++ b/src/indexer.c @@ -12,8 +12,8 @@ #include "common/debug.h" #include "common/path.h" #include "arch/db.h" -#include "fs/notify.h" -#include "fs/tree.h" +#include "notify/notify.h" +#include "notify/tree.h" #include "indexer.h" static char *stack[256]; diff --git a/src/fs/notify_event.c b/src/notify/event.c similarity index 96% rename from src/fs/notify_event.c rename to src/notify/event.c index f3a9326..a1e0a6c 100644 --- a/src/fs/notify_event.c +++ b/src/notify/event.c @@ -1,4 +1,4 @@ -/* fs/notify_event.c - notify event implementation +/* notify/event.c - notify event implementation * * (C) Copyright 2010 Henrik Hautakoski * (C) Copyright 2010 Fredric Nilsson @@ -12,7 +12,7 @@ #include #include -#include "notify_event.h" +#include "event.h" #include "../common/path.h" #define dealloc_data(ev) \ diff --git a/src/fs/notify_event.h b/src/notify/event.h similarity index 89% rename from src/fs/notify_event.h rename to src/notify/event.h index 1c5cdfc..94489d2 100644 --- a/src/fs/notify_event.h +++ b/src/notify/event.h @@ -1,4 +1,4 @@ -/* fs/notify_event.h - event data structure and operation's for notify API +/* notify/event.h - event data structure and operation's for notify API * * (C) Copyright 2010 Henrik Hautakoski * (C) Copyright 2010 Fredric Nilsson @@ -9,9 +9,8 @@ * (at your option) any later version. */ -#ifndef _NOTIFY_EVENT_H - -#define _NOTIFY_EVENT_H +#ifndef __NOTIFY_EVENT_H +#define __NOTIFY_EVENT_H #include @@ -45,4 +44,4 @@ void notify_event_set_type(notify_event *event, uint8_t type); const char* notify_event_typetostr(notify_event *event); -#endif /* _NOTIFY_EVENT_H */ +#endif /* __NOTIFY_EVENT_H */ diff --git a/src/fs/notify_inotify.c b/src/notify/inotify.c old mode 100755 new mode 100644 similarity index 99% rename from src/fs/notify_inotify.c rename to src/notify/inotify.c index 258e2d2..e5400dd --- a/src/fs/notify_inotify.c +++ b/src/notify/inotify.c @@ -1,4 +1,4 @@ -/* fs/notify_inotify.c - inotify implementation +/* notify/inotify.c - inotify implementation * * (C) Copyright 2010 Henrik Hautakoski * (C) Copyright 2010 Fredric Nilsson diff --git a/src/fs/notify.h b/src/notify/notify.h old mode 100755 new mode 100644 similarity index 82% rename from src/fs/notify.h rename to src/notify/notify.h index 0c4956d..ec086d7 --- a/src/fs/notify.h +++ b/src/notify/notify.h @@ -1,4 +1,4 @@ -/* fs/notify.h - filesystem notification API +/* notify/notify.h - filesystem notification API * * (C) Copyright 2010 Henrik Hautakoski * (C) Copyright 2010 Fredric Nilsson @@ -9,11 +9,11 @@ * (at your option) any later version. */ -#ifndef _FS_NOTIFY_H -#define _FS_NOTIFY_H +#ifndef __NOTIFY_NOTIFY_H +#define __NOTIFY_NOTIFY_H /* notify event def's and operations */ -#include "notify_event.h" +#include "event.h" int notify_init(); @@ -32,4 +32,4 @@ void notify_stat(); /* TODO: context-switch/threading should be implementation specific. */ int notify_is_ready(); -#endif /* _FS_NOTIFY_H */ +#endif /* __NOTIFY_NOTIFY_H */ diff --git a/src/fs/queue.c b/src/notify/queue.c similarity index 99% rename from src/fs/queue.c rename to src/notify/queue.c index 7ba3dad..ea43bed 100644 --- a/src/fs/queue.c +++ b/src/notify/queue.c @@ -1,4 +1,4 @@ -/* src/fs/notify_queue.c +/* notify/queue.c * * Copyright (C) 2010 Henrik Hautakoski * diff --git a/src/fs/queue.h b/src/notify/queue.h similarity index 88% rename from src/fs/queue.h rename to src/notify/queue.h index fda3241..2e4563c 100644 --- a/src/fs/queue.h +++ b/src/notify/queue.h @@ -1,4 +1,4 @@ -/* src/fs/notify_queue.c +/* notify/queue.h * * Copyright (C) 2010 Henrik Hautakoski * @@ -11,8 +11,8 @@ * along with this program. If not, see . */ -#ifndef __FS_QUEUE_H -#define __FS_QUEUE_H +#ifndef __NOTIFY_QUEUE_H +#define __NOTIFY_QUEUE_H #include @@ -32,4 +32,4 @@ void queue_clear(queue_t *q); void queue_destroy(queue_t *q); -#endif /* __FS_QUEUE_H */ +#endif /* __NOTIFY_QUEUE_H */ diff --git a/src/fs/tree.c b/src/notify/tree.c similarity index 98% rename from src/fs/tree.c rename to src/notify/tree.c index 6b0f7c1..b35f356 100644 --- a/src/fs/tree.c +++ b/src/notify/tree.c @@ -1,4 +1,4 @@ -/* fs/tree.c - Filesystem traversal +/* notify/tree.c - Filesystem traversal * * (C) Copyright 2010 Henrik Hautakoski * diff --git a/src/fs/tree.h b/src/notify/tree.h similarity index 87% rename from src/fs/tree.h rename to src/notify/tree.h index bfef8b7..8d87fa0 100644 --- a/src/fs/tree.h +++ b/src/notify/tree.h @@ -1,4 +1,4 @@ -/* fs/tree.h - Filesystem traversal +/* notify/tree.h - Filesystem traversal * * (C) Copyright 2010 Henrik Hautakoski * @@ -8,9 +8,8 @@ * (at your option) any later version. */ -#ifndef _FS_TREE_H - -#define _FS_TREE_H +#ifndef __NOTIFY_TREE_H +#define __NOTIFY_TREE_H #define MAX_DEPTH 0x20 @@ -40,4 +39,4 @@ struct entry* tree_cpy_ent(struct entry *ent); struct entry* tree_next_ent(struct tree *tree); -#endif /* _FS_TREE_H */ +#endif /* __NOTIFY_TREE_H */ diff --git a/test/Makefile b/test/Makefile index db7e2dc..22ef9b0 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,21 +1,15 @@ # Test makefile -DEFS= -D__DEBUG__ CC=gcc -CFLAGS=-g +CFLAGS=-g -D__DEBUG__ +LDFLAGS=-L/usr/lib64/mysql -lmysqlclient -all : - make rbtree - make inotify - make mysql +all : raw_inotify strbuf path rbtree inotify tree indexer mysql queue raw_inotify : - $(CC) -linotifytools raw_inotify.c -o raw_inotify + $(CC) -linotifytools t_raw_inotify.c -o test_raw_inotify strbuf : $(CC) $(CFLAGS) ../src/common/strbuf.c t_strbuf.c -o test_strbuf - -config : - $(CC) ../src/common/config.c t_config.c -o test_config path : $(CC) $(DEFS) $(CFLAGS) unit.c ../src/common/path.c t_path.c -o test_path @@ -27,20 +21,30 @@ inotify : $(CC) -lpthread -D INOTIFY_DEBUG -D RB_DEBUG $(CFLAGS) \ ../src/common/rbtree.c \ ../src/common/path.c \ - ../src/fs/scan.c \ - ../src/fs/notify_event.c \ - ../src/fs/inotify.c \ + ../src/notify/event.c \ + ../src/notify/tree.c \ + ../src/notify/inotify.c \ t_inotify.c -o test_inotify tree : - $(CC) $(CFLAGS) $(DEFS) ../src/common/path.c ../src/fs/tree.c t_tree.c -o test_tree + $(CC) $(CFLAGS) ../src/common/path.c ../src/notify/tree.c t_tree.c -o test_tree indexer : - $(CC) $(CFLAGS) -D__DEBUG__ ../src/common/path.c ../src/fs/tree.c ../src/indexer.c t_indexer.c -o test_indexer + $(CC) $(CFLAGS) $(LDFLAGS) \ + ../src/common/rbtree.c \ + ../src/common/path.c \ + ../src/notify/tree.c \ + ../src/notify/inotify.c \ + ../src/notify/event.c \ + ../src/arch/mysql.c \ + ../src/indexer.c \ + t_indexer.c -o test_indexer mysql : - $(CC) -D DB_DEBUG $(CFLAGS) ../src/arch/mysql.c -L/usr/lib64/mysql \ - -lmysqlclient -lz -lcrypt -lnsl -lm -L/usr/lib64 -lssl -lcrypto t_mysql.c -o test_mysql + $(CC) -D DB_DEBUG $(CFLAGS) $(LDFLAGS) ../src/arch/mysql.c t_mysql.c -o test_mysql queue : - $(CC) $(CFLAGS) ../src/fs/queue.c t_queue.c -o test_queue + $(CC) $(CFLAGS) ../src/notify/queue.c t_queue.c -o test_queue + +clean : + rm -f test_* diff --git a/test/t_inotify.c b/test/t_inotify.c index de90e51..479bdc0 100644 --- a/test/t_inotify.c +++ b/test/t_inotify.c @@ -1,6 +1,6 @@ #include -#include "../src/fs/notify.h" +#include "../src/notify/notify.h" PROT_SCAN_CALLBACK(my_callback) { //printf("FROM THREAD -- path: %s; is_dir = %i\n", path, dir); @@ -33,7 +33,7 @@ int main(int argc, char *argv[]) { "Filename: %s\n" "Directory: %u\n" "====================\n" - , notify_event_masktostr(event), event->path, event->filename, event->dir); + , notify_event_typetostr(event), event->path, event->filename, event->dir); } return 0; diff --git a/test/t_queue.c b/test/t_queue.c index a82536b..7b0316f 100644 --- a/test/t_queue.c +++ b/test/t_queue.c @@ -1,7 +1,7 @@ #include #include -#include "../src/fs/queue.h" +#include "../src/notify/queue.h" int main() { diff --git a/test/raw_inotify.c b/test/t_raw_inotify.c similarity index 100% rename from test/raw_inotify.c rename to test/t_raw_inotify.c diff --git a/test/t_tree.c b/test/t_tree.c index 81a8905..6bc6b5e 100644 --- a/test/t_tree.c +++ b/test/t_tree.c @@ -1,6 +1,6 @@ #include -#include "../src/fs/tree.h" +#include "../src/notify/tree.h" int main(int argc, char *argv[]) {