Tests + bugfix

Testing ttail_search_closest_files() on multiple files

src/ttail_search_files.c

@@ -5,6 +5,7 @@ int _ttail_search_closest_files(ttail_t* t, const struct tm *tm)
 	int ret;
 	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)
 	{
@@ -18,19 +19,22 @@ int _ttail_search_closest_files(ttail_t* t, const struct tm *tm)
 		perror("Unable to allocate memory");
 		goto _ttail_search_closest_files_alloc_err;
 	}
+	prev_found = 0;
+	prev = 0;
 	for(i=0; i<t->logfile_sz; i++)
 	{
+		if(!t->logfile[i])
+		{
+			ftm[i] = NULL;
+			continue;
+		}
 		ftm[i] = malloc(sizeof(struct tm)*2);
 		if(!ftm[i])
 		{
 			perror("Unable to allocate memory for time");
 			goto _ttail_search_closest_files_alloc_loop_err;
 		}
-		if(!t->logfile[i])
-		{
-			continue;
-		}
-		ret = _ttail_file_minmax(t, 0, ftm[i]);
+		ret = _ttail_file_minmax(t, i, ftm[i]);
 		if(ret < 0)
 		{
 			fprintf(stderr, "Minmax error\n");
@@ -47,9 +51,9 @@ a valid date in '%s'\n", t->logfile_name[i]);
 			ftm[i] = NULL;
 			fclose(t->logfile[i]);
 			t->logfile[i] = NULL;
+			continue;
 		}
-		prev = i;
-		if(i && prev &&
+		if(i && prev_found &&
 			ttail_tm_cmp(&(ftm[prev][1]), &(ftm[i][0])) > 0)
 		{
 			/* files are not sorted */
@@ -57,6 +61,8 @@ a valid date in '%s'\n", t->logfile_name[i]);
 File sorting not implemented yet\n");
 			goto _ttail_search_closest_files_loop_err;
 		}
+		prev_found = 1;
+		prev = i;
 	}
 	/* TODO begining binary search of date_min */
 	ret = _ttail_search_files_binary_search(t, tm, (const struct tm**)ftm);
@@ -66,8 +72,8 @@ File sorting not implemented yet\n");
 	}
 	free(ftm);
 	return ret;
-	goto _ttail_search_closest_files_err;
 
+	goto _ttail_search_closest_files_err;
 	_ttail_search_closest_files_err:
 	i = t->logfile_sz;
 	do
@@ -115,7 +121,7 @@ int _ttail_search_files_binary_search(ttail_t* t, const struct tm* in,
 			/* found at the begining of the file */
 			return 0;
 		}
-		else if (cmax <= 0)
+		else if (cmax == 0)
 		{
 			/* found at EOF */
 			*off = _ttail_from_search_from_end(t, *id, in);
@@ -128,9 +134,14 @@ int _ttail_search_files_binary_search(ttail_t* t, const struct tm* in,
 		}
 		else if(cmin > 0)
 		{
-			/* not found */
-			*id=0;
-			return 1;
+			if(!*id)
+			{
+				/* not found */
+				return 1;
+			}
+			/* found at start of file */
+			off = 0;
+			return 0;
 		}
 		else if(*id == t->logfile_sz - 1 ||
 			cmax > 0)
@@ -529,6 +540,10 @@ inline off_t _ttail_from_search_from_end(ttail_t* t , size_t id ,
 			}
 			else
 			{
+				if(cmpret < 0 && result < 0)
+				{
+					result = last;
+				}
 				break;
 			}
 		}

tests/ttail_search_check.c

@@ -8,9 +8,9 @@
 
 ttail_t *ttail;
 
-char *samples[5] = { "./samples/1.log", "./samples/2.log", "./samples/3.log",\
-	"./samples/4.log", "./samples/5.log"};
-off_t samples_sz[5] = { 442, 0, 893, 2587, 2310 };
+char *samples[6] = { "./samples/1.log", "./samples/2.log", "./samples/3.log",\
+	"./samples/4.log", "./samples/5.log", "./samples/1.1.log"};
+off_t samples_sz[6] = { 442, 0, 893, 2587, 2310, 220 };
 FILE *fpl;
 
 void setup_file_line(void)
@@ -43,7 +43,7 @@ void setup_closest_fileinit(void)
 {
 	size_t i;
 	setup_closest();
-	for(i=0; i<5; i++)
+	for(i=0; i<6; i++)
 	{
 		ttail_add_logfile(ttail, samples[i]);
 	}
@@ -72,7 +72,7 @@ START_TEST (test_search_closest_init_filesz)
 {
 	size_t i;
 	_ttail_search_closest_files_init(ttail);
-	for(i=0;i<5;i++)
+	for(i=0;i<6;i++)
 	{
 		ck_assert(samples_sz[i] == ttail->session->file.file_sz[i]);
 	}
@@ -88,7 +88,7 @@ START_TEST (test_search_closest_init_vfile)
 	_ttail_search_closest_files_init(ttail);
 
 	full_sz = 0;
-	for(i=0;i<5;i++)
+	for(i=0;i<6;i++)
 	{
 		ck_assert(full_sz == ttail->session->file.vfile[i]);
 		full_sz += samples_sz[i];
@@ -356,6 +356,35 @@ START_TEST (test_search_files2)
 }
 END_TEST
 
+START_TEST (test_search_files3)
+{
+	int ret;
+	size_t i;
+	struct tm tm;
+	memset(&tm, 0, sizeof(tm));
+	for(i=1;i<ttail->logfile_sz-1;i++)
+	{
+		fclose(ttail->logfile[i]);
+		ttail->logfile[i] = NULL;
+	}
+	ttail->flag |= TTAIL_FLAG_PREFIX;
+	ttail->prefix_sz = 0;
+	ttail_set_fmt(ttail, "%B%n%d %H:%M");
+
+	tm.tm_year = -1;
+	tm.tm_mon = 2;
+	tm.tm_mday = 6;
+	tm.tm_hour = 1;
+	tm.tm_min = 0;
+	tm.tm_sec = -1;
+
+	ret = _ttail_search_closest_files(ttail, &tm);
+	ck_assert_int_eq(ret, 0);
+	ck_assert_int_eq(ttail->session->file.id, 5);
+	ck_assert_int_eq(ttail->session->file.off, 0);
+}
+END_TEST
+
 Suite * ttail_search_files_suite(void)
 {
 	Suite *s;
@@ -407,6 +436,7 @@ ttail_logline_closest_files_init() checks");
 		setup_closest_fileinit, teardown_closest_fileinit);
 	tcase_add_test(tc_search_files, test_search_files1);
 	tcase_add_test(tc_search_files, test_search_files2);
+	tcase_add_test(tc_search_files, test_search_files3);
 	
 
 	suite_add_tcase(s, tc_search_closest_fileinit);