[broken] Files searching function 1st implementation

untested

src/include/ttail_search_files.h

@@ -21,15 +21,28 @@ struct _ttail_search_file_s
 	/*<! Shift width to apply on size to compute stuff */
 	short sz_div;
 	#endif
-	/*<! Computed files start size */
+	/*<! Computed files start size
+	 *@todo delete, useless
+	 */
 	off_t *vfile;
-	/*<! Computed file sizes sum */
+	/*<! Computed file sizes sum 
+	 *@todo delete useless
+	 */
 	off_t vsz;
-	/*<! Computed position */
+	/*<! Computed position 
+	 *@todo delete, useless
+	 */
 	off_t vpos;
 
+	/*<! buffer for ttail_getiline() macro */
 	char *buf;
+	/*<! buffer size for ttail_getiline() macro */
 	size_t buf_sz;
+	
+	/*<! Current file id */
+	size_t id;
+	/*<! Current file offset */
+	off_t off;
 };
 
 #include "config.h"
@@ -48,6 +61,8 @@ struct _ttail_search_file_s
 #define ttail_getline_buf(TTAIL) (TTAIL->session->file.buf)
 
 /**@brief @ref ttail_search_closest() implementation for logfiles
+ *
+ *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
  */
@@ -55,14 +70,27 @@ 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 Test if files are sorted
- *
- *If not sorted attempt to sort them
- *@param ttail_t*
- *@return -1 not sorted 0 sorted -3 error
- *@todo checks
+/**@brief Binary search of the last logline with a date < tm
+ *@param ttail ttail_t*
+ *@param tm struct tm*
+ *param id size_t* result file id
+ *@param off off_t* set to -1 if none found
+ *@param ftm struct tm** local variable of @ref _ttail_search_closest_files()
+ *@return 0 if ok -1 if error 1 if empty result
+ */
+int _ttail_search_files_binary_search(ttail_t*, const struct tm*,
+	const struct tm**);
+
+/**@brief Binary search of the last logline with a date < tm in a file
+ *@param ttail ttail_t*
+ *@param tm struct tm*
+ *param id size_t the file to search into
+ *@param off off_t* set to -1 if none found
+ *@param ftm struct tm** local variable of @ref _ttail_search_closest_files()
+ *@return 0 if ok -1 if error 1 if empty result
  */
-int _ttail_search_file_sorted(ttail_t*);
+int _ttail_search_file_binary_search(ttail_t*, const struct tm*,
+	const struct tm**);
 
 /**@brief Attempt to reopen a file
  *@param ttail_t* ttail
@@ -105,6 +133,20 @@ inline long _ttail_file_start_line(FILE*);
  */
 inline off_t _ttail_from_search_from_end(ttail_t*, size_t, const struct tm*);
 
+/**@brief Read a line from off and compare its date to tm
+ *@param t ttail_t*
+ *@param id site_t
+ *@param off off_t
+ *@param tm const struct tm*
+ *@param res int* see return value of @ref ttail_tm_cmp()
+ *@return 0 on success -1 on error 1 if no date found
+ */
+inline int _ttail_file_off_cmp(ttail_t*, size_t, off_t, const struct tm*, int*);
+
+/**@brief Same than _ttail_file_off_cmp() but from current pos
+ *@return 0 on success -1 on error 1 if no date found*/
+inline int _ttail_file_cur_cmp(ttail_t*, size_t, const struct tm*, int*);
+
 /**@brief Free the ttail_search_file_t session
  *@param ttail_t* ttail
  */

src/ttail_search_files.c

@@ -59,6 +59,7 @@ File sorting not implemented yet\n");
 		}
 	}
 	/* TODO begining binary search of date_min */
+	ret = _ttail_search_files_binary_search(t, tm, (const struct tm**)ftm);
 
 	return 0;
 	goto _ttail_search_closest_files_err;
@@ -80,6 +81,129 @@ File sorting not implemented yet\n");
 	return -1;
 }
 
+int _ttail_search_files_binary_search(ttail_t* t, const struct tm* in,
+	const struct tm** ftm)
+{
+	int cmin, cmax;
+	size_t valid;
+	off_t *off;
+	size_t *id;
+	off = &(t->session->file.off);
+	id = &(t->session->file.id);
+	*id = *off = 0;
+	valid = 0;
+	if(ttail_tm_cmp(&(ftm[0][0]), in) > 0)
+	{
+		return 1;
+	}
+	while(1)
+	{
+		if(!ftm[*id])
+		{
+			(*id)++;
+			continue;
+		}
+		valid++;
+		cmin = ttail_tm_cmp(&(ftm[*id][0]), in);
+		cmax = ttail_tm_cmp(&(ftm[*id][1]), in);
+		if(!cmin)
+		{
+			/* found at the begining of the file */
+			return 0;
+		}
+		else if (!cmax)
+		{
+			/* found at EOF */
+			*off = _ttail_from_search_from_end(t, *id, in);
+			if(*off < 0)
+			{
+				*off = 0;
+				return -1;
+			}
+			return 0;
+		}
+		else if(cmin > 0)
+		{
+			/* not found */
+			*id=0;
+			return 1;
+		}
+		else if(*id == t->logfile_sz - 1 ||
+			cmax > 0)
+		{
+			/* somewhere in current file */
+			break;
+		}
+		(*id)++;
+	}
+	if(!valid)
+	{
+		fprintf(stderr, "No files to scan");
+	}
+	/* the answer is somewhere in *id file */
+	*off = _ttail_from_search_from_end(t, *id, in);
+	return 0;
+}
+
+inline int _ttail_search_file_binary_search(ttail_t* t, const struct tm* in,
+	const struct tm** ftm)
+{
+	off_t cur, sz, d, prev;
+	int ret, cmpres;
+	off_t *off;
+	size_t id;
+	off = &(t->session->file.off);
+	id = t->session->file.id;
+	
+	sz = t->session->file.file_sz[id];
+	d = cur = sz / 2;
+	prev = 0;
+	cmpres = 0;
+	while(1)
+	{
+		cur = _ttail_file_next_line(t->logfile[id]);
+		if(cur < -1)
+		{
+			cur = _ttail_file_start_line(t->logfile[id]);
+			if(cur < 0)
+			{
+				return -1;
+			}
+		}
+		if(cur == prev)
+		{
+			*off = cur;
+			return 0;
+		}
+		prev = cur;
+		ret = _ttail_file_cur_cmp(t, id, in, &cmpres);
+		if(ret < 0)
+		{
+			return -1;
+		}
+		else if(cmpres == 0)
+		{
+			*off = cur;
+			break;
+		}
+		else if(cmpres < 0)
+		{
+			ret = _ttail_file_cur_cmp(t, id, in, &cmpres);
+			if(cmpres >=0)
+			{
+				*off = cur;
+				break;
+			}
+			d/=2;
+			cur += d;
+			cur %= t->session->file.file_sz[id];
+		}
+		else
+		{
+			d/=2;
+			cur -= d;
+		}
+	}
 	return 0;
 }
 
@@ -87,6 +211,7 @@ int _ttail_search_closest_files_init(ttail_t* t)
 {
 	struct stat stat;
 	FILE *fp;
+	int fd;
 	size_t i;
 	off_t *file_sz;
 
@@ -114,11 +239,13 @@ int _ttail_search_closest_files_init(ttail_t* t)
 		fp = t->logfile[i];
 		if(!fp)
 		{
-			if(_ttail_file_reopen(t,i))
-			{
-				file_sz[i] = 0;
-				continue;
-			}
+			file_sz[i] = 0;
+			continue;
+		}
+		if((fd = fileno(fp)) < 0)
+		{
+			perror("Unable to get fp");
+			goto _ttail_search_closest_files_err;
 		}
 		if(fstat(fileno(fp), &stat))
 		{
@@ -407,6 +534,38 @@ inline off_t _ttail_from_search_from_end(ttail_t* t , size_t id ,
 	return -1;
 }
 
+inline int _ttail_file_off_cmp(ttail_t* t, size_t id, off_t off,
+	const struct tm* tm, int *res)
+{
+	if(fseek(t->logfile[id], off, SEEK_CUR))
+	{
+		return -1;
+	}
+	if(ttail_getline(t, id) < 0)
+	{
+		return -1;
+	}
+	return _ttail_file_cur_cmp(t, id, tm, res);
+}
+inline int _ttail_file_cur_cmp(ttail_t* t, size_t id, const struct tm* tm ,
+	int* res)
+{
+	int ret;
+	struct tm ctm;
+	ret = ttail_logline2date(t, ttail_getline_buf(t), &ctm);
+	if(ret < 0)
+	{
+		return -1;
+	}
+	else if(ret == 1)
+	{
+		return 1;
+	}
+	*res = ttail_tm_cmp(&ctm, tm);
+	return 0;
+
+}
+
 void _ttail_search_file_free(ttail_t* t)
 {
 	if(!t->session)