mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Addresses #1531 Fix test_logflush

Browse source 
git-svn-id: file:///svn/toku/tokudb@9966 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Yoni Fogel 2013-04-16 23:57:43 -04:00
parent 1e1031f1ce
commit ccccc144c2
1 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/tests/test_logflush.c
View file

@ -5,7 +5,6 @@
#include <db.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/mman.h>
// Return the offset
static int
@ -15,22 +14,15 @@ grep_for_in_logs (const char *str) {
#else
#define lname ENVDIR "//log.0000000001"
#endif
int fd = open(lname, O_RDONLY);
assert(fd>=0);
int64_t file_size;
int r = toku_os_get_file_size(fd, &file_size);
assert(r==0);
void *addr_v = mmap(0, file_size, PROT_READ, MAP_PRIVATE, fd, 0);
assert(addr_v!=MAP_FAILED);
char *fstr = addr_v;
int searchlen=strlen(str);
int i;
for (i=0; i+searchlen<file_size; i++) {
if (memcmp(str, fstr+i, searchlen)==0) {
return i;
}
}
return -1;
#define COMMAND "grep -F -o"
char systembuf[strlen(str)+sizeof(COMMAND " \"\" " lname " > /dev/null")];
int bytes = snprintf(systembuf, sizeof(systembuf), COMMAND " \"%s\" %s > /dev/null", str, lname);
assert(bytes>=0);
assert((size_t)bytes<sizeof(systembuf));
int r = system(systembuf);
assert(r!=-1);
if (r>0) r = -1;
return r;
}
int