Preparing autoformat detection on loglines

src/include/ttail.h

@@ -58,6 +58,10 @@ typedef struct _ttail_s ttail_t;
 "%y-%m-%d",\
 "%Y/%m/%d:%H:%M",NULL}
 
+
+/**@brief Pointer on autodetect format provider */
+typedef int (*ttail_search_fmtdetect_provider)(ttail_t*, int*, size_t*, char***);
+
 struct _ttail_s
 {
 	char **logfile_name; /*!< logfiles name */
@@ -85,6 +89,10 @@ struct _ttail_s
 	int flag;
 
 	ttail_search_t *session;
+	
+	/**@brief Set by session init function to allow format autodetection
+	 * on loglines */
+	ttail_search_fmtdetect_provider fmtdetect_provider;
 };
 
 #endif

src/include/ttail_search.h

@@ -28,8 +28,11 @@
 #include <unistd.h>
 
 typedef union _ttail_search_u ttail_search_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
@@ -52,6 +55,16 @@ union _ttail_search_u
 	ttail_search_stdin_t std;
 };
 
+
+/**@brief Init ttail search session
+ *
+ *If logfiles given as argument start a files session. Else a stdin session
+ *is started
+ *@param ttail_t* t
+ *@return 0 on success -1 on error
+ */
+int ttail_search_init_session(ttail_t*);
+
 /**@brief Begin a search session placing it in a ready to print situation
  *@param ttail_t*
  *@param struct tm* tmin

src/include/ttail_search_files.h

@@ -87,21 +87,36 @@ struct _ttail_search_file_s
 /*<!Accessor to getline wrapper buffer */
 #define ttail_file_getline_buf(TTAIL) (TTAIL->session->file.buf)
 
+/**@brief Init the ttail->session
+ *@note Needed for format autodetection
+ *@return 0 on success -1 on failure
+ */
+int ttail_search_files_init(ttail_t*);
+
 /**@brief @ref ttail_search_closest() implementation for logfiles
  *
+ *@warning Expect that ttail_search_closest_files_init() has been called
  *Will set struct _ttail_search_file_s.id and struct _ttail_search_file_s.off
  *@param ttail_t*
  *@return 0 if ok -1 if fatal error 1 if not found
  */
 int _ttail_search_closest_files(ttail_t*);
 
+/**@brief Provide datas for format autodetection
+ *@param ttail_t* t
+ *@param int* : retry left
+ *@param size_t* : line count
+ *@param char*** : pointer on lines buffer
+ *@return -1 on error 1 on autodetection impossible 0 on success
+ */
+int _ttail_search_fmtdetect_provider_files(ttail_t*, int*, size_t*, char***);
+
 /**@brief Output result loglines to stdout
  *@param ttail_t*
  *@param int fd
  */
 void _ttail_search_print_files(ttail_t*, int);
 
-int _ttail_search_closest_files_init(ttail_t*);
 int _ttail_search_closest_files_set_fsizes(ttail_t*);
 
 /**@brief Binary search of the last logline with a date < tm

src/include/ttail_search_std.h

@@ -27,7 +27,11 @@ typedef struct _ttail_search_stdin_s ttail_search_stdin_t;
 /*<! Private search session for stdin */
 struct _ttail_search_stdin_s
 {
+	/**@brief ttail_std_getline buffer
+	 *@note buffer is used by format detection
+	 */
 	char *buff;
+	/**@brief buffer size */
 	size_t buff_sz;
 };
 
@@ -50,9 +54,19 @@ struct _ttail_search_stdin_s
  *@return -1 on error else 0
  *@todo checks
  */
-int _ttail_search_closest_std_init(ttail_t* t);
+int ttail_search_std_init(ttail_t* t);
+
+/**@brief Provide datas for format autodetection
+ *@param ttail_t* t
+ *@param int* : retry left
+ *@param size_t* : line count
+ *@param char*** : pointer on lines buffer
+ *@return -1 on error 1 on autodetection impossible 0 on success
+ */
+int _ttail_search_fmtdetect_provider_std(ttail_t*, int*, size_t*, char***);
 
 /**@brief @ref ttail_search_closest() implementation for stdin
+ *@warning Expect that ttail_search_closest_std_init() has been called
  *@note when returns ttail->session->std.buff contains the first
  *line to print
  *@param ttail_t*
@@ -61,6 +75,7 @@ int _ttail_search_closest_std_init(ttail_t* t);
  *@todo checks
  */
 int _ttail_search_closest_stdin(ttail_t*);
+
 /**@brief Output result loglines to stdout
  *@param ttail_t*
  *@param int fd

src/main.c

@@ -34,6 +34,12 @@ int main(int argc, char **argv)
 		ttail_free(ttail);
 		return 1;
 	}
+	if(ttail_search_init_session(ttail) < 0)
+	{
+		fprintf(stderr, "Unable to initialise search session\n");
+		ttail_free(ttail);
+		return 1;
+	}
 	res = ttail_search_closest(ttail);
 	if(res < 0)
 	{

src/ttail_search.c

@@ -18,14 +18,26 @@
  */
 #include "ttail_search.h"
 
-int ttail_search_closest(ttail_t* ttail)
+int ttail_search_init_session(ttail_t* ttail)
 {
-	int ret;
 	if(ttail->session != NULL)
 	{
 		fprintf(stderr, "A session is allready started\n");
 		return -1;
 	}
+	return ttail->logfile_sz?\
+		ttail_search_files_init(ttail):\
+		ttail_search_std_init(ttail);
+}
+
+int ttail_search_closest(ttail_t* ttail)
+{
+	int ret;
+	if(ttail->session == NULL)
+	{
+		fprintf(stderr, "No session started yet\n");
+		return -1;
+	}
 	ret = ttail->logfile_sz?\
 		_ttail_search_closest_files(ttail):\
 		_ttail_search_closest_stdin(ttail);

src/ttail_search_files.c

@@ -24,11 +24,6 @@ int _ttail_search_closest_files(ttail_t* t)
 	size_t i, prev;
 	struct tm **ftm; /* t->logfile_sz len of struct tm[2] */
 	char prev_found;
-	ret = _ttail_search_closest_files_init(t);
-	if(ret)
-	{
-		return ret;
-	}
 	/* Storing min & max of each files in ftm and checking that files are 
 	 * sorted well */
 	ftm = malloc(sizeof(struct tm*) * t->logfile_sz);
@@ -37,6 +32,7 @@ int _ttail_search_closest_files(ttail_t* t)
 		perror("Unable to allocate memory");
 		goto _ttail_search_closest_files_alloc_err;
 	}
+	ret = 0; /* to avoid may be used uninitialized error */
 	prev_found = 0;
 	prev = 0;
 	for(i=0; i<t->logfile_sz; i++)
@@ -145,6 +141,12 @@ date-max\n");
 	return -1;
 }
 
+int _ttail_search_fmtdetect_provider_files(ttail_t *t, int *try_left, 
+		size_t* line_sz, char*** lines_ptr)
+{
+	return 1;
+}
+
 void _ttail_search_print_files(ttail_t* t, int out)
 {
 	size_t i;
@@ -436,7 +438,7 @@ to a date directly from a file\n");
 	return 0;
 }
 
-int _ttail_search_closest_files_init(ttail_t* t)
+int ttail_search_files_init(ttail_t* t)
 {
 	struct stat stat;
 	FILE *fp;
@@ -498,6 +500,7 @@ int _ttail_search_closest_files_init(ttail_t* t)
 	{
 		goto _ttail_search_closest_files_err;
 	}
+	t->fmtdetect_provider = _ttail_search_fmtdetect_provider_files;
 
 	return 0;
 

src/ttail_search_std.c

@@ -18,7 +18,7 @@
  */
 #include "ttail_search_std.h"
 
-int _ttail_search_closest_std_init(ttail_t* t)
+int ttail_search_std_init(ttail_t* t)
 {
 	t->session = (ttail_search_t*)malloc(sizeof(ttail_search_stdin_t));
 	if(!t->session)
@@ -28,24 +28,37 @@ int _ttail_search_closest_std_init(ttail_t* t)
 	}
 	t->session->std.buff = NULL;
 	t->session->std.buff_sz = 0;
+	t->fmtdetect_provider = _ttail_search_fmtdetect_provider_std;
 	return 0;
 }
 
+int _ttail_search_fmtdetect_provider_std(ttail_t *t, int *try_left, 
+		size_t* line_sz, char*** lines_ptr)
+{
+	return 1;
+}
+
 int _ttail_search_closest_stdin(ttail_t* t)
 {
 	struct tm tm;
 	ssize_t rd_sz;
 	int ret, tmp;
-	if(_ttail_search_closest_std_init(t) < 0)
-	{
-		return -1;
-	}
 	if(!(t->flag & TTAIL_FLAG_DATE_MIN))
 	{
 		return 0;
 	}
-	while((rd_sz = ttail_std_getline(t)) > 0)
+	if(! t->session->std.buff)
+	{
+		rd_sz = ttail_std_getline(t);
+	}
+	else
+	{
+		rd_sz = strlen(ttail_std_getline_buff(t)) + 1;
+	}
+	while(rd_sz > 0)
 	{
+		/*first line allready in the buffer thank's to format
+		 *detection*/
 		ttail_tm_init(&tm);
 		ret = ttail_logline2date(t, ttail_std_getline_buff(t), &tm);
 		if(ret < 0)
@@ -62,6 +75,7 @@ int _ttail_search_closest_stdin(ttail_t* t)
 			//buffer contains the first line to print
 			return 0;
 		}
+		rd_sz = ttail_std_getline(t);
 	}
 	if(rd_sz < 0)
 	{

tests/ttail_search_check.c

@@ -59,7 +59,7 @@ START_TEST (test_search_closest_init)
 {
 	int ret;
 
-	ret = _ttail_search_closest_files_init(ttail);
+	ret = ttail_search_files_init(ttail);
 	ck_assert_int_eq(ret,0);
 	ck_assert(ttail->session->file.vpos == 0);
 	#ifdef HUGEFILE
@@ -71,7 +71,7 @@ END_TEST
 START_TEST (test_search_closest_init_filesz)
 {
 	size_t i;
-	_ttail_search_closest_files_init(ttail);
+	ttail_search_files_init(ttail);
 	for(i=0;i<6;i++)
 	{
 		ck_assert(samples_sz[i] == ttail->session->file.file_sz[i]);
@@ -85,7 +85,7 @@ START_TEST (test_search_closest_init_vfile)
 	size_t i;
 	off_t full_sz;
 
-	_ttail_search_closest_files_init(ttail);
+	ttail_search_files_init(ttail);
 
 	full_sz = 0;
 	for(i=0;i<6;i++)
@@ -157,7 +157,7 @@ START_TEST (test_file_minmax1)
 	ttail->flag |= TTAIL_FLAG_PREFIX;
 	ttail->prefix_sz = 0;
 	ttail_set_fmt(ttail, "%b%n%d %H:%M");
-	r = _ttail_search_closest_files_init(ttail);
+	r = ttail_search_files_init(ttail);
 	ck_assert_int_eq(r, 0);
 	r = _ttail_file_minmax(ttail, 0, tm);
 	ck_assert_int_eq(r, 0);
@@ -322,6 +322,9 @@ START_TEST (test_search_files1)
 	memcpy(&(ttail->date_min), &tm, sizeof(tm));
 	ttail->flag |= TTAIL_FLAG_DATE_MIN;
 
+	ret = ttail_search_files_init(ttail);
+	ck_assert_int_eq(ret,0);
+
 	ret = _ttail_search_closest_files(ttail);
 	ck_assert_int_eq(ret, 0);
 	ck_assert(ttail->session->file.off_min.id == 0);
@@ -353,6 +356,9 @@ START_TEST (test_search_files2)
 	memcpy(&(ttail->date_min), &tm, sizeof(tm));
 	ttail->flag |= TTAIL_FLAG_DATE_MIN;
 	
+	ret = ttail_search_files_init(ttail);
+	ck_assert_int_eq(ret,0);
+
 	ret = _ttail_search_closest_files(ttail);
 	ck_assert_int_eq(ret, 0);
 	ck_assert(ttail->session->file.off_min.id == 0);
@@ -384,6 +390,9 @@ START_TEST (test_search_files3)
 	memcpy(&(ttail->date_min), &tm, sizeof(tm));
 	ttail->flag |= TTAIL_FLAG_DATE_MIN;
 
+	ret = ttail_search_files_init(ttail);
+	ck_assert_int_eq(ret,0);
+
 	ret = _ttail_search_closest_files(ttail);
 	ck_assert_int_eq(ret, 0);
 	ck_assert_int_eq(ttail->session->file.off_min.id, 5);