Changeset 5 for trunk

Timestamp:

07/08/15 16:00:10 (9 years ago)

Author:

tim

Message:

.

Location:

trunk

Files:

• bin/analyze_packets (moved) (moved from trunk/bin/analyze)
• bin/sampler (modified) (3 diffs)
• lib/nanownlib/__init__.py (modified) (1 diff)

trunk/bin/sampler

@@ -36 +36 @@
 parser.add_argument('-c', dest='cases', type=str, default='{"short":10000,"long":13000}',
                     help='JSON representation of echo timing cases.')
-parser.add_argument('--tcpts', action='store_true', help='Enable TCP timestamp profiling')
+parser.add_argument('--no-tcpts', action='store_true', help='Disbale TCP timestamp profiling')
 parser.add_argument('session_name', default=None,
                     help='Name for the sampler session (used in output filenames)')
@@ -100 +100 @@
 
 meta = {'tcpts_mean':None,'tcpts_stddev':None,'tcpts_slopes':None}
-if options.tcpts:
+if not options.no_tcpts:
     sys.stderr.write("INFO: Probing target for TCP timestamp precision...\n")
     sniffer_fp = tempfile.NamedTemporaryFile('w+t')
@@ -134 +134 @@
 
 sid = 0
-sample_types = [('train',int(num_samples*2/7)),
-                ('train_null',int(num_samples*3/7)+1),
-                ('test',int(num_samples*2/7)),
+sample_types = [('train',int(num_samples*1/5)),
+                ('train_null',int(num_samples*2/5)),
+                ('test',int(num_samples*2/5)),
                 ('test_null',0)]
 report_interval = 20

trunk/lib/nanownlib/__init__.py

@@ -379 +379 @@
         pcursor.execute("INSERT INTO analysis SELECT id,probe_id,suspect,packet_rtt,tsval_rtt FROM trim_analysis WHERE sent_trimmed=? AND rcvd_trimmed=?",
                         (best_strim,best_rtrim))
+
+    #pcursor.execute("DELETE FROM trim_analysis")
+    db.conn.commit()
     
     return count