File spliting

src/Makefile.am

@@ -1,8 +1,9 @@
 bin_PROGRAMS = ttail
 noinst_LIBRARIES= libttail.a
 
-ttail_SOURCES = main.c ttail_init.c ttail_search.c
-libttail_a_SOURCES = ttail_init.c ttail_search.c
+libttail_a_SOURCES = ttail_init.c ttail_search.c ttail_search_files.c
+ttail_SOURCES = main.c $(libttail_a_SOURCES)
+#ttail_SOURCES = main.c ttail_init.c ttail_search.c ttail_search_files.c
 if HUGEFILE
 ttail_CFLAGS = @CFLAGS@ -DTTAIL_HUGE_FILE
 libttail_a_CFLAGS = @CFLAGS@ -DTTAIL_HUGE_FILE
@@ -11,10 +12,10 @@ endif
 if DEBUG
 if HUGEFILE
 bin_PROGRAMS += ttail_no_huge
-ttail_no_huge_SOURCES = main.c ttail_init.c ttail_search.c
+ttail_no_huge_SOURCES = $(ttail_SOURCES)
 else
 bin_PROGRAMS += ttail_huge
-ttail_huge_SOURCES = main.c ttail_init.c ttail_search.c
+ttail_huge_SOURCES = $(ttail_SOURCES)
 ttail_huge_CFLAGS = @CFLAGS@ -DTTAIL_HUGE_FILE
 endif
 endif

src/include/ttail_search.h

@@ -10,31 +10,21 @@
 #include <unistd.h>
 
 typedef union _ttail_search_u ttail_search_t;
-
-#include "config.h"
+typedef struct _ttail_search_stdin_s ttail_search_stdin_t;
 #include "ttail.h"
-
 typedef char* (*ttail_search_subst_f)(ttail_t*, const char*);
+/**@brief Comparison results
+ *
+ * -1 if a < b, 1 if a > b, 0 if a == b, -2 if exception
+ *
+ * If an exception occur, exception flags are set with | on the result.
+ * Exceptions flags are : TTAIL_NODATE_A and TTAIL_NODATE_B
+ */
+typedef int ttail_cmp_res;
 
-typedef struct _ttail_search_file_s ttail_search_file_t;
-typedef struct _ttail_search_stdin_s ttail_search_stdin_t;
 
-/*<! Private search session for logfiles */
-struct _ttail_search_file_s
-{
-	/*<! logfile sizes */
-	off_t *file_sz;
-	#ifdef TTAIL_HUGE_FILE
-	/*<! Shift width to apply on size to compute stuff */
-	short sz_div;
-	#endif
-	/*<! Computed files start size */
-	off_t *vfile;
-	/*<! Computed file sizes sum */
-	off_t vsz;
-	/*<! Computed position */
-	off_t vpos;
-};
+#include "config.h"
+#include "ttail_search_files.h"
 
 /*<! Private search session for stdin */
 struct _ttail_search_stdin_s
@@ -52,43 +42,18 @@ union _ttail_search_u
 	ttail_search_stdin_t std;
 };
 
-/**@brief Comparison results
- *
- * -1 if a < b, 1 if a > b, 0 if a == b, -2 if exception
- *
- * If an exception occur, exception flags are set with | on the result.
- * Exceptions flags are : TTAIL_NODATE_A and TTAIL_NODATE_B
- */
-typedef int ttail_cmp_res;
-
 /**@brief Begin a search session placing it in a ready to print situation
  *@param ttail_t*
  *@return 0 if ok -1 if fatal error 1 if not found
  */
 int ttail_search_closest(ttail_t*);
 
-/**@brief @ref ttail_search_closest() implementation for logfiles
- *@param ttail_t*
- *@return 0 if ok -1 if fatal error 1 if not found
- */
-int _ttail_search_closest_files(ttail_t*);
-int _ttail_search_closest_files_init(ttail_t*);
-int _ttail_search_closest_files_set_fsizes(ttail_t*);
-
 /**@brief @ref ttail_search_closest() implementation for stdin
  *@param ttail_t*
  *@return 0 if ok -1 if fatal error 1 if not found
  */
 int _ttail_search_closest_stdin(ttail_t*);
 
-/**@brief Attempt to reopen a file
- *@param ttail_t* ttail
- *@param size_t id file id in ttail
- *@return 0 on success, -1 on failure and errno is set
- *@throw EINVAL if id is too big
- */
-int _ttail_file_reopen(ttail_t*, size_t);
-
 /**@brief Loglines comparison function
  *@param ttail_t* ttail
  *@param const char* logline a

src/include/ttail_search_files.h

@@ -0,0 +1,56 @@
+#ifndef _ttail_search_files_h__
+#define _ttail_search_files_h__
+
+#include <errno.h>
+#include <string.h>
+#include <time.h>
+#include <regex.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+typedef struct _ttail_search_file_s ttail_search_file_t;
+
+
+/*<! Private search session for logfiles */
+struct _ttail_search_file_s
+{
+	/*<! logfile sizes */
+	off_t *file_sz;
+	#ifdef TTAIL_HUGE_FILE
+	/*<! Shift width to apply on size to compute stuff */
+	short sz_div;
+	#endif
+	/*<! Computed files start size */
+	off_t *vfile;
+	/*<! Computed file sizes sum */
+	off_t vsz;
+	/*<! Computed position */
+	off_t vpos;
+};
+
+#include "config.h"
+#include "ttail.h"
+#include "ttail_search.h"
+
+/**@brief @ref ttail_search_closest() implementation for logfiles
+ *@param ttail_t*
+ *@return 0 if ok -1 if fatal error 1 if not found
+ */
+int _ttail_search_closest_files(ttail_t*);
+int _ttail_search_closest_files_init(ttail_t*);
+int _ttail_search_closest_files_set_fsizes(ttail_t*);
+
+/**@brief Attempt to reopen a file
+ *@param ttail_t* ttail
+ *@param size_t id file id in ttail
+ *@return 0 on success, -1 on failure and errno is set
+ *@throw EINVAL if id is too big
+ */
+int _ttail_file_reopen(ttail_t*, size_t);
+
+/**@brief Free the ttail_search_file_t session
+ *@param ttail_t* ttail
+ */
+void _ttail_search_file_free(ttail_t*);
+#endif

src/ttail_search.c

@@ -21,120 +21,9 @@ int ttail_search_closest(ttail_t* ttail)
 		_ttail_search_closest_stdin(ttail);
 }
 
-int _ttail_search_closest_files(ttail_t* t)
-{
-	return _ttail_search_closest_files_init(t);
-}
-
-int _ttail_search_closest_files_init(ttail_t* t)
-{
-	struct stat stat;
-	FILE *fp;
-	size_t i;
-	off_t *file_sz;
-
-	t->session = (ttail_search_t*)malloc(sizeof(ttail_search_file_t));
-	if(!t->session)
-	{
-		perror("Unable to allocate memory for search session");
-		goto _ttail_search_closest_files_alloc_session_err;
-	}
-	memset(t->session, 0, sizeof(ttail_search_file_t));
-
-	file_sz = malloc(sizeof(off_t)*t->logfile_sz);
-	if(!file_sz)
-	{
-		perror("Unable to allocate memory for file sizes");
-		goto _ttail_search_closest_files_alloc_err;
-	}
-	t->session->file.file_sz = file_sz;
-	#ifdef HUGEFILE
-	t->session->file.sz_div = 0;
-	#endif
-
-	for(i=0;i<t->logfile_sz;i++)
-	{
-		fp = t->logfile[i];
-		if(!fp)
-		{
-			if(_ttail_file_reopen(t,i))
-			{
-				file_sz[i] = 0;
-				continue;
-			}
-		}
-		if(fstat(fileno(fp), &stat))
-		{
-			perror("Unable to get file size");
-			goto _ttail_search_closest_files_err;
-		}
-		file_sz[i] = stat.st_size;
-	}
-	/* we got all real size, determining if we need a divisor */
-	/*
-	 * not implemented
-	 */
-	if(_ttail_search_closest_files_set_fsizes(t))
-	{
-		goto _ttail_search_closest_files_err;
-	}
-
-	return 0;
-
-	_ttail_search_closest_files_err:
-	free(file_sz);
-	t->session->file.file_sz = NULL;
-	_ttail_search_closest_files_alloc_err:
-	free(t->session);
-	_ttail_search_closest_files_alloc_session_err:
-	return -1;
-}
-
-int _ttail_search_closest_files_set_fsizes(ttail_t* t)
-{
-	size_t i;
-	off_t *vfile, *vsz;
-	vfile = malloc(sizeof(off_t)*t->logfile_sz);
-	if(!vfile)
-	{
-		perror("Unable to allocate memory for file size sum");
-		return -1;
-	}
-	t->session->file.vfile = vfile;
-	vsz = &(t->session->file.vsz);
-	*vsz = 0;
-	for(i=0; i<t->logfile_sz;i++)
-	{
-		vfile[i] = *vsz;
-		#ifdef HUGEFILE
-		*vsz += t->session->file.file_sz[i] >> t->session->file.sz_div;
-		#else
-		*vsz += t->session->file.file_sz[i];
-		#endif
-	}
-	t->session->file.vpos = 0;
-	return 0;
-}
-
-int _ttail_file_reopen(ttail_t* t, size_t id)
-{
-	if(t->logfile[id])
-	{
-		fclose(t->logfile[id]);
-	}
-	t->logfile[id] = fopen(t->logfile_name[id], "r");
-	if(!t->logfile[id] && t->verbose > 2)
-	{
-		fprintf(stderr, "Unable to reopen '%s'\n",
-			t->logfile_name[id]);
-	}
-	return t->logfile[id]?0:-1;
-}
-
 int _ttail_search_closest_stdin(ttail_t* t)
 {
-	fprintf(stderr, "Search on stdin not implemented yet");
-	return -1;
+	return 0;
 }
 
 int ttail_logline2date(ttail_t* ttail, const char* logline, struct tm* tm)

src/ttail_search_files.c

@@ -0,0 +1,135 @@
+#include "ttail_search_files.h"
+
+int _ttail_search_closest_files(ttail_t* t)
+{
+	int ret;
+	ret = _ttail_search_closest_files_init(t);
+	if(ret)
+	{
+		return ret;
+	}
+
+	return 0;
+}
+
+int _ttail_search_closest_files_init(ttail_t* t)
+{
+	struct stat stat;
+	FILE *fp;
+	size_t i;
+	off_t *file_sz;
+
+	t->session = (ttail_search_t*)malloc(sizeof(ttail_search_file_t));
+	if(!t->session)
+	{
+		perror("Unable to allocate memory for search session");
+		goto _ttail_search_closest_files_alloc_session_err;
+	}
+	memset(t->session, 0, sizeof(ttail_search_file_t));
+
+	file_sz = malloc(sizeof(off_t)*t->logfile_sz);
+	if(!file_sz)
+	{
+		perror("Unable to allocate memory for file sizes");
+		goto _ttail_search_closest_files_alloc_err;
+	}
+	t->session->file.file_sz = file_sz;
+	#ifdef HUGEFILE
+	t->session->file.sz_div = 0;
+	#endif
+
+	for(i=0;i<t->logfile_sz;i++)
+	{
+		fp = t->logfile[i];
+		if(!fp)
+		{
+			if(_ttail_file_reopen(t,i))
+			{
+				file_sz[i] = 0;
+				continue;
+			}
+		}
+		if(fstat(fileno(fp), &stat))
+		{
+			perror("Unable to get file size");
+			goto _ttail_search_closest_files_err;
+		}
+		file_sz[i] = stat.st_size;
+	}
+	/* we got all real size, determining if we need a divisor */
+	/*
+	 * not implemented
+	 */
+	if(_ttail_search_closest_files_set_fsizes(t))
+	{
+		goto _ttail_search_closest_files_err;
+	}
+
+	return 0;
+
+	_ttail_search_closest_files_err:
+	free(file_sz);
+	t->session->file.file_sz = NULL;
+	_ttail_search_closest_files_alloc_err:
+	free(t->session);
+	_ttail_search_closest_files_alloc_session_err:
+	return -1;
+}
+
+int _ttail_search_closest_files_set_fsizes(ttail_t* t)
+{
+	size_t i;
+	off_t *vfile, *vsz;
+	vfile = malloc(sizeof(off_t)*t->logfile_sz);
+	if(!vfile)
+	{
+		perror("Unable to allocate memory for file size sum");
+		return -1;
+	}
+	t->session->file.vfile = vfile;
+	vsz = &(t->session->file.vsz);
+	*vsz = 0;
+	for(i=0; i<t->logfile_sz;i++)
+	{
+		vfile[i] = *vsz;
+		#ifdef HUGEFILE
+		*vsz += t->session->file.file_sz[i] >> t->session->file.sz_div;
+		#else
+		*vsz += t->session->file.file_sz[i];
+		#endif
+	}
+	t->session->file.vpos = 0;
+	return 0;
+}
+
+int _ttail_file_reopen(ttail_t* t, size_t id)
+{
+	if(t->logfile[id])
+	{
+		fclose(t->logfile[id]);
+	}
+	t->logfile[id] = fopen(t->logfile_name[id], "r");
+	if(!t->logfile[id] && t->verbose > 2)
+	{
+		fprintf(stderr, "Unable to reopen '%s'\n",
+			t->logfile_name[id]);
+	}
+	return t->logfile[id]?0:-1;
+}
+
+void _ttail_search_file_free(ttail_t* t)
+{
+	if(!t->session)
+	{
+		return;
+	}
+	if(t->session->file.file_sz)
+	{
+		free(t->session->file.file_sz);
+	}
+	if(t->session->file.vfile)
+	{
+		free(t->session->file.vfile);
+	}
+	free(t->session);
+}

tests/ttail_search_check.c

@@ -32,11 +32,17 @@ void setup_closest_fileinit(void)
 	}
 }
 
+void teardown_closest_fileinit(void)
+{
+	teardown_closest();
+	_ttail_search_file_free(ttail);
+}
+
 START_TEST (test_search_closest_init)
 {
 	int ret;
 
-	ret = ttail_search_closest(ttail);
+	ret = _ttail_search_closest_files_init(ttail);
 	ck_assert_int_eq(ret,0);
 	ck_assert(ttail->session->file.vpos == 0);
 	#ifdef HUGEFILE
@@ -48,7 +54,7 @@ END_TEST
 START_TEST (test_search_closest_init_filesz)
 {
 	size_t i;
-	ttail_search_closest(ttail);
+	_ttail_search_closest_files_init(ttail);
 	for(i=0;i<5;i++)
 	{
 		ck_assert(samples_sz[i] == ttail->session->file.file_sz[i]);
@@ -62,7 +68,7 @@ START_TEST (test_search_closest_init_vfile)
 	size_t i;
 	off_t full_sz;
 
-	ttail_search_closest(ttail);
+	_ttail_search_closest_files_init(ttail);
 
 	full_sz = 0;
 	for(i=0;i<5;i++)
@@ -83,7 +89,7 @@ Suite * ttail_search_suite(void)
 	tc_search_closest_fileinit = tcase_create("\
 ttail_logline_closest_files_init() checks");
 	tcase_add_checked_fixture(tc_search_closest_fileinit,
-		setup_closest_fileinit, teardown_closest);
+		setup_closest_fileinit, teardown_closest_fileinit);
 	tcase_add_test(tc_search_closest_fileinit, test_search_closest_init);
 	tcase_add_test(tc_search_closest_fileinit,
 		test_search_closest_init_filesz);