completed ppf/README

diff --git a/ppf/README b/ppf/README
index a3c42b1..ab7d1de 100644 (file)
--- a/ppf/README
+++ b/ppf/README
@@ -7,45 +7,34 @@ in the P2P-Next BitTorrent experiments. The framework has several main component
 - GUI statistics engine
 
 Directory Contents:
-db/                                    - P2P-Next Database Helper Objects 
-       db-init                         - create P2P-Next Logging Database script; 
-                                         uses sql/p2p-log-sqlite.sql script
-       DatabaseAccess.py               - 
-       DatabaseCommander.py            - 
-       DatabaseWriter.py               -
-       julian.py                       -
-       sidereal.py                     -
-       
+db/ - P2P-Next Database Helper Objects 
+       - see db/README
 
-sql/                                   - SQLite database scripts
-       p2p-log-sqlite.sql              - create SQLite database script
-
-
-extra/                                 -
+sql/ - SQLite database scripts used by Database Objects
        
 log-parser/ - parsers for Tribler and Libtorrent logs
     - tribler/  
-        - LogParser.py - parses verbose messages
-        - StatusParser.py - parses status messages
-        - run_sample - starts StatusParser for a given status log and database
-                     file
-        - run_sample_verbose - starts LogParser for a given verbose log and 
-                    database file
-        - make_db - creates an SQLite database file 
-        - merge_status_msg.sh - script that merges status messages output by 
-                    Tribler in two different files, into a single file 
+        - LogParser.py         - parses verbose messages
+        - StatusParser.py      - parses status messages
+        - run_sample           - starts StatusParser for a given status log and 
+                                 database file
+        - run_sample_verbose   - starts LogParser for a given verbose log and 
+                                 database file
+        - make_db              - creates an SQLite database file 
+        - merge_status_msg.sh  - script that merges status messages output by 
+                                 Tribler in two different files, into a single file 
                                                                 
     - libtorrent/  
-            - LogParser.py - parses verbose messages
-            - StatusParser.py - parses status messages
-            - run_sample - creates a database file and fills it with test data
-                         - starts LogParser and StatusParser
+            - LogParser.py     - parses verbose messages
+            - StatusParser.py  - parses status messages
+            - run_sample       - creates a database file and fills it with test 
+                                 data; starts LogParser and StatusParser
 
-log-samples/- verbose and status log samples for Tribler and libtorrent
+log-samples/ - verbose and status log samples for Tribler and libtorrent
 
-viewer/                                        -
-       p2p-nextviewer.py               - P2P-Next GUI statistics engine
-       DbObjects.py                    - P2P-Next Database Objects used by GUI 
-       mpleditor.py                    - matplotlib editor used by GUI
-       config.py                       - global variables for GUI
-       run_viewer                      - shell script for running the GUI
+GUI/ - P2P-Next GUI statistics engine
+       - GUI.py                - implements GUI engine
+       - DbObjects.py          - P2P-Next Database Objects used by GUI 
+       - mpleditor.py          - matplotlib editor used by GUI
+       - config.py             - global variables for GUI
+       - run_GUI               - shell script for running the GUI

diff --git a/ppf/extra/db_init.py b/ppf/extra/db_init.py
deleted file mode 100644 (file)
index 76d82f6..0000000
--- a/ppf/extra/db_init.py
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env python
-
-import sqlite3
-
-conn = connect('p2p-next.db')
-curs = conn.cursor()
-
-curs.execute("pragma foreign_keys = ON;")
-curs.execute('drop table if exists status_messages')
-curs.execute('drop table if exists verbose_messages')
-curs.execute('drop table if exists client_sessions')
-curs.execute('drop table if exists btclients')
-curs.execute('drop table if exists swarms')
-
-curs.execute("""create table swarms(
-               id integer primary key autoincrement, 
-               torrent text, 
-               filesize integer, 
-               purpose text, 
-               source text check(source in ('local', 'URL'))
-               )""")
-
-curs.execute('''create table btclients(
-               id integer primary key autoincrement, 
-               name text, 
-               language text, 
-               dht integer check(dht between 0 and 1),
-               streaming integer check(streaming between 0 and 1)
-               )''')
-
-curs.execute('''create table client_sessions(
-               id integer primary key autoincrement, 
-               swarm_id integer references swarms(id), 
-               client_id integer references btclients(id),
-               system_os text,
-               system_os_version text,
-               system_ram integer,
-               system_cpu integer,
-               public_ip text,
-               public_port integer,
-               ds_limit integer,
-               us_limit integer,
-               start_time date
-               )''')
-
-curs.execute('''create table status_messages (
-               cs_id integer references client_sessions(id),
-               timestamp date,
-               peer_num integer,
-               dht integer,
-               download_speed integer,
-               upload_speed integer,
-               download_size integer,
-               upload_size integer,
-               eta date
-               )''')
-
-curs.execute('''create table verbose_messages (
-               cs_id integer references client_sessions(id),
-               timestamp date,
-               peer_ip integer,
-               peer_port integer check(peer_port between 1 and 65535),
-               message_type integer,
-               _index integer,
-               begin integer,
-               length integer,
-               listen_port integer check(listen_port between 1 and 65535)
-               )''')
-
-#for t in [('1', 'mumu', '1024', 'ceva', 'URL'),
-#      ('2', 'gugu', '1024', 'ceva', 'URL'),
-#      ('3', 'gaga', '1024', 'ceva', 'URL'),
-#      ]:
-#      curs.execute('insert into swarms values (?,?,?,?,?)', t)
-#conn.commit()
-
-#curs.execute('select * from swarms')
-#for row in curs:
-#      print row
-#      
-#conn.close()