mirror of
git://erdgeist.org/opentracker
synced 2025-02-17 06:31:30 +08:00
Parse accesslist file by mmaping the whole thing and searching for lines by ourself. fgets is slooooooow on linux.
This commit is contained in:
parent
bb9650f55e
commit
553f62329a
@ -14,6 +14,7 @@
|
|||||||
#include "byte.h"
|
#include "byte.h"
|
||||||
#include "scan.h"
|
#include "scan.h"
|
||||||
#include "ip6.h"
|
#include "ip6.h"
|
||||||
|
#include "mmap.h"
|
||||||
|
|
||||||
/* Opentracker */
|
/* Opentracker */
|
||||||
#include "trackerlogic.h"
|
#include "trackerlogic.h"
|
||||||
@ -48,17 +49,15 @@ static int accesslist_addentry( ot_vector *al, ot_hash infohash ) {
|
|||||||
|
|
||||||
/* Read initial access list */
|
/* Read initial access list */
|
||||||
static void accesslist_readfile( int sig ) {
|
static void accesslist_readfile( int sig ) {
|
||||||
FILE * accesslist_filehandle;
|
|
||||||
ot_hash infohash;
|
ot_hash infohash;
|
||||||
ot_vector accesslist_tmp;
|
ot_vector accesslist_tmp;
|
||||||
void *olddata;
|
void *olddata;
|
||||||
char inbuf[512];
|
char *map, *map_end, *read_offs;
|
||||||
|
size_t maplen;
|
||||||
|
|
||||||
if( sig != SIGHUP ) return;
|
if( sig != SIGHUP ) return;
|
||||||
|
|
||||||
accesslist_filehandle = fopen( g_accesslist_filename, "r" );
|
if( ( map = mmap_read( g_accesslist_filename, &maplen ) ) == NULL ) {
|
||||||
|
|
||||||
if( accesslist_filehandle == NULL ) {
|
|
||||||
char *wd = getcwd( NULL, 0 );
|
char *wd = getcwd( NULL, 0 );
|
||||||
fprintf( stderr, "Warning: Can't open accesslist file: %s (but will try to create it later, if necessary and possible).\nPWD: %s\n", g_accesslist_filename, wd );
|
fprintf( stderr, "Warning: Can't open accesslist file: %s (but will try to create it later, if necessary and possible).\nPWD: %s\n", g_accesslist_filename, wd );
|
||||||
free( wd );
|
free( wd );
|
||||||
@ -68,26 +67,34 @@ static void accesslist_readfile( int sig ) {
|
|||||||
/* Initialise an empty accesslist vector */
|
/* Initialise an empty accesslist vector */
|
||||||
memset( &accesslist_tmp, 0, sizeof(accesslist_tmp));
|
memset( &accesslist_tmp, 0, sizeof(accesslist_tmp));
|
||||||
|
|
||||||
|
/* No use */
|
||||||
|
map_end = map + maplen - 41;
|
||||||
|
read_offs = map;
|
||||||
|
|
||||||
/* We do ignore anything that is not of the form "^[:xdigit:]{40}[^:xdigit:].*" */
|
/* We do ignore anything that is not of the form "^[:xdigit:]{40}[^:xdigit:].*" */
|
||||||
while( fgets( inbuf, sizeof(inbuf), accesslist_filehandle ) ) {
|
while( read_offs < map_end ) {
|
||||||
int i;
|
int i;
|
||||||
for( i=0; i<(int)sizeof(ot_hash); ++i ) {
|
for( i=0; i<(int)sizeof(ot_hash); ++i ) {
|
||||||
int eger = 16 * scan_fromhex( inbuf[ 2*i ] ) + scan_fromhex( inbuf[ 1 + 2*i ] );
|
int eger = 16 * scan_fromhex( read_offs[ 2*i ] ) + scan_fromhex( read_offs[ 1 + 2*i ] );
|
||||||
if( eger < 0 )
|
if( eger < 0 )
|
||||||
continue;
|
continue;
|
||||||
infohash[i] = eger;
|
infohash[i] = eger;
|
||||||
}
|
}
|
||||||
if( scan_fromhex( inbuf[ 40 ] ) >= 0 )
|
|
||||||
continue;
|
read_offs += 40;
|
||||||
|
|
||||||
/* Append accesslist to accesslist vector */
|
/* Append accesslist to accesslist vector */
|
||||||
accesslist_addentry( &accesslist_tmp, infohash );
|
if( scan_fromhex( *read_offs ) < 0 )
|
||||||
|
accesslist_addentry( &accesslist_tmp, infohash );
|
||||||
|
|
||||||
|
/* Find start of next line */
|
||||||
|
while( read_offs < map_end && *(read_offs++) != '\n' );
|
||||||
}
|
}
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
fprintf( stderr, "Added %zd info_hashes to accesslist\n", accesslist_tmp.size );
|
fprintf( stderr, "Added %zd info_hashes to accesslist\n", accesslist_tmp.size );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
fclose( accesslist_filehandle );
|
mmap_unmap( map, maplen);
|
||||||
|
|
||||||
/* Now exchange the accesslist vector in the least race condition prone way */
|
/* Now exchange the accesslist vector in the least race condition prone way */
|
||||||
accesslist.size = 0;
|
accesslist.size = 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user