From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QXqsb-0003jl-8V for garchives@archives.gentoo.org; Sat, 18 Jun 2011 08:27:45 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF7031C01A; Sat, 18 Jun 2011 08:27:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A3B1C1C01A for ; Sat, 18 Jun 2011 08:27:37 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD63D1B4011 for ; Sat, 18 Jun 2011 08:27:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E2FE98003C for ; Sat, 18 Jun 2011 08:27:35 +0000 (UTC) From: "Александр Берсенев" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Александр Берсенев" Message-ID: <17d67416cdb1addb6b77961686177520400a4d46.bay@gentoo> Subject: [gentoo-commits] proj/autodep:master commit in: logger/src/autodep/logfs/, logger/src/hook_fusefs/ X-VCS-Repository: proj/autodep X-VCS-Files: logger/src/autodep/logfs/fstracer.py logger/src/hook_fusefs/hookfs.c X-VCS-Directories: logger/src/autodep/logfs/ logger/src/hook_fusefs/ X-VCS-Committer: bay X-VCS-Committer-Name: Александр Берсенев X-VCS-Revision: 17d67416cdb1addb6b77961686177520400a4d46 Date: Sat, 18 Jun 2011 08:27:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: c830f7b0356dbb24479ca41f2c1db041 commit: 17d67416cdb1addb6b77961686177520400a4d46 Author: Alexander Bersenev hackerdom ru> AuthorDate: Sat Jun 18 14:27:23 2011 +0000 Commit: =D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80 =D0=91= =D0=B5=D1=80=D1=81=D0=B5=D0=BD=D0=B5=D0=B2 hackerdom ru> CommitDate: Sat Jun 18 14:27:23 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/autodep.git;a= =3Dcommit;h=3D17d67416 small performance optimization --- logger/src/autodep/logfs/fstracer.py | 22 ++++++---------------- logger/src/hook_fusefs/hookfs.c | 13 +------------ 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/logger/src/autodep/logfs/fstracer.py b/logger/src/autodep/lo= gfs/fstracer.py index 5ca8305..a632269 100644 --- a/logger/src/autodep/logfs/fstracer.py +++ b/logger/src/autodep/logfs/fstracer.py @@ -18,9 +18,9 @@ import logger_fusefs =20 =20 def unescape(s): - s=3Dre.sub(r'\\r', '\r', s) - s=3Dre.sub(r'\\n', '\n', s) - s=3Dre.sub(r'\\(.)', r'\1', s) + s=3Ds.replace(r'\\r', '\r') + s=3Ds.replace(r'\\n', '\n') + s=3Ds.replace(r'\\', '') return s =20 def parse_message(message): @@ -138,7 +138,7 @@ def getfsevents(prog_name,arguments,approach=3D"hookl= ib",filterproc=3Ddefaultfilter) sock_listen=3Dsocket.socket(socket.AF_UNIX, socket.SOCK_STREAM) sock_listen.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) sock_listen.bind(socketname) - sock_listen.listen(65536*8) + sock_listen.listen(65536) except socket.error, e: print "Failed to create a socket for exchange data with the logger: = %s" % e return [] @@ -168,7 +168,7 @@ def getfsevents(prog_name,arguments,approach=3D"hookl= ib",filterproc=3Ddefaultfilter) buffers =3D {} =20 while input: - inputready,outputready,exceptready =3D select.select(input,[],[],5) + inputready,_,_ =3D select.select(input,[],[],5) =09 for s in inputready: #print "!! len: %d" % len(buffers) @@ -222,11 +222,8 @@ def getfsevents(prog_name,arguments,approach=3D"hook= lib",filterproc=3Ddefaultfilter) =09 else: eventname,filename,stage,result=3Dmessage[1:5] - #stage=3Dget_stage_by_pid(int(messagepid),pid) - print message; + #print message; =20 - s.sendall("ALLOW\n"); # to continue execution - =20 if not stage in events: events[stage]=3D[{},{}] =20 @@ -256,13 +253,6 @@ def getfsevents(prog_name,arguments,approach=3D"hook= lib",filterproc=3Ddefaultfilter) =20 else: print "Error in logger module<->analyser protocol" - # check previous five messages for possible repeats - #for prevevent in events[-5:]: - #if prevevent[1:]=3D=3Dmessage[1:]: - # break - #else: - #pass - #events.append(message) =20 except IndexError: print "IndexError while parsing %s"%record diff --git a/logger/src/hook_fusefs/hookfs.c b/logger/src/hook_fusefs/hoo= kfs.c index 23db13d..a633276 100644 --- a/logger/src/hook_fusefs/hookfs.c +++ b/logger/src/hook_fusefs/hookfs.c @@ -79,10 +79,6 @@ static void __print_escaped(FILE *fh ,const char *s){ for(;(*s)!=3D0; s++) { if(*s=3D=3D' ') fprintf(fh,"\\ "); - else if(*s=3D=3D',') - fprintf(fh,"\\,"); - else if(*s=3D=3D'\r') - fprintf(fh,"\\r"); else if(*s=3D=3D'\n') fprintf(fh,"\\n"); else if(*s=3D=3D'\\') @@ -231,11 +227,7 @@ static void raw_log_event(const char *event_type, co= nst char *filename, char *re fprintf(log_file,"%s",result); =20 fprintf(log_file,"\n"); - fflush(log_file); - - // always wait for an answer -// fflush(log_file); // yes, it is here too - =20 + fflush(log_file); =20 } =20 /* @@ -247,9 +239,6 @@ static void log_event(const char *event_type, const c= har *filename, char *result pthread_mutex_lock( &socketblock ); raw_log_event(event_type,filename,result,err,stage); =20 - char answer[8]; - fscanf(log_file,"%7s",answer); - pthread_mutex_unlock( &socketblock ); } =20