From 562d19593cdd07889c74e4f74476ce380f1108c3 Mon Sep 17 00:00:00 2001 From: Marius Sandu-Popa Date: Sat, 10 Apr 2010 11:23:55 +0300 Subject: [PATCH] repocleanup: moved db, viewer, log-parsers to ppf --- bt_comm/client/Client.py | 8 ++++---- {auto => ppf}/db/.gitignore | 0 {auto => ppf}/db/DatabaseAccess.py | 0 {auto => ppf}/db/DatabaseCommander.py | 0 {auto => ppf}/db/DatabaseWriter.py | 0 {auto => ppf}/db/README | 0 {auto => ppf}/db/client_sessions.sample.txt | 0 {auto => ppf}/db/db_init | 0 {auto => ppf}/db/julian.py | 0 {auto => ppf}/db/sidereal.py | 0 {auto => ppf}/db/status_messages.sample.txt | 0 {auto => ppf}/db/swarms.sample.txt | 0 {auto => ppf}/db/verbose_messages.sample.txt | 0 {auto => ppf}/extra/db_init.py | 0 {log-parser => ppf/log-parser}/libtorrent/LogParser.py | 0 {log-parser => ppf/log-parser}/libtorrent/README | 0 {log-parser => ppf/log-parser}/libtorrent/StatusParser.py | 0 {log-parser => ppf/log-parser}/libtorrent/run_sample | 0 {log-parser => ppf/log-parser}/tribler/LogParser.py | 0 {log-parser => ppf/log-parser}/tribler/StatusParser.py | 0 {log-parser => ppf/log-parser}/tribler/make_db | 0 {log-parser => ppf/log-parser}/tribler/run_sample | 0 {log-parser => ppf/log-parser}/tribler/run_sample_verbose | 0 .../log-samples}/libtorrent/141.85.224.222_50200.log | 0 .../log-samples}/libtorrent/libtorrent-status.sample.log | 0 {log-samples => ppf/log-samples}/tribler/log/smth.txt | 0 .../tribler/log/test1_verbose_msg_request.log | 0 {log-samples => ppf/log-samples}/tribler/log/test2.txt | 0 .../log-samples}/tribler/log/test2_verbose_msg.log | 0 {auto => ppf}/sql/.gitignore | 0 {auto => ppf}/sql/README | 0 {auto => ppf}/sql/p2p-log-sqlite.sql | 0 {auto => ppf}/util/julian.py | 0 {auto => ppf}/util/sidereal.py | 0 {viewer => ppf/viewer}/DbObjects.py | 0 {viewer => ppf/viewer}/README | 0 {viewer => ppf/viewer}/config.py | 0 {viewer => ppf/viewer}/mpleditor.py | 0 {viewer => ppf/viewer}/p2p-nexteditor.py | 0 {viewer => ppf/viewer}/run_viewer | 0 40 files changed, 4 insertions(+), 4 deletions(-) rename {auto => ppf}/db/.gitignore (100%) rename {auto => ppf}/db/DatabaseAccess.py (100%) rename {auto => ppf}/db/DatabaseCommander.py (100%) rename {auto => ppf}/db/DatabaseWriter.py (100%) rename {auto => ppf}/db/README (100%) rename {auto => ppf}/db/client_sessions.sample.txt (100%) rename {auto => ppf}/db/db_init (100%) rename {auto => ppf}/db/julian.py (100%) rename {auto => ppf}/db/sidereal.py (100%) rename {auto => ppf}/db/status_messages.sample.txt (100%) rename {auto => ppf}/db/swarms.sample.txt (100%) rename {auto => ppf}/db/verbose_messages.sample.txt (100%) rename {auto => ppf}/extra/db_init.py (100%) rename {log-parser => ppf/log-parser}/libtorrent/LogParser.py (100%) rename {log-parser => ppf/log-parser}/libtorrent/README (100%) rename {log-parser => ppf/log-parser}/libtorrent/StatusParser.py (100%) rename {log-parser => ppf/log-parser}/libtorrent/run_sample (100%) rename {log-parser => ppf/log-parser}/tribler/LogParser.py (100%) rename {log-parser => ppf/log-parser}/tribler/StatusParser.py (100%) rename {log-parser => ppf/log-parser}/tribler/make_db (100%) rename {log-parser => ppf/log-parser}/tribler/run_sample (100%) rename {log-parser => ppf/log-parser}/tribler/run_sample_verbose (100%) rename {log-samples => ppf/log-samples}/libtorrent/141.85.224.222_50200.log (100%) rename {log-samples => ppf/log-samples}/libtorrent/libtorrent-status.sample.log (100%) rename {log-samples => ppf/log-samples}/tribler/log/smth.txt (100%) rename {log-samples => ppf/log-samples}/tribler/log/test1_verbose_msg_request.log (100%) rename {log-samples => ppf/log-samples}/tribler/log/test2.txt (100%) rename {log-samples => ppf/log-samples}/tribler/log/test2_verbose_msg.log (100%) rename {auto => ppf}/sql/.gitignore (100%) rename {auto => ppf}/sql/README (100%) rename {auto => ppf}/sql/p2p-log-sqlite.sql (100%) rename {auto => ppf}/util/julian.py (100%) rename {auto => ppf}/util/sidereal.py (100%) rename {viewer => ppf/viewer}/DbObjects.py (100%) rename {viewer => ppf/viewer}/README (100%) rename {viewer => ppf/viewer}/config.py (100%) rename {viewer => ppf/viewer}/mpleditor.py (100%) rename {viewer => ppf/viewer}/p2p-nexteditor.py (100%) rename {viewer => ppf/viewer}/run_viewer (100%) diff --git a/bt_comm/client/Client.py b/bt_comm/client/Client.py index e2b6d64..3526e9e 100644 --- a/bt_comm/client/Client.py +++ b/bt_comm/client/Client.py @@ -45,11 +45,11 @@ class Commander(Thread): def sendComm(self, hostname, port, msg_type, config_data): try: self.sock.connect((hostname, port)) - self.send(msg_type) - response = self.recv_msg() + self.sendMsg(msg_type) + response = self.recvMsg() if response == ACK_MSG: self.sendMsg(pickle.dumps(config_data)) - response = self.recv_msg() + response = self.recvMsg() print "->>>>>>>>>>>>>>>>>>>>>>>>>", response except Exception as e: print e @@ -75,7 +75,7 @@ class Commander(Thread): def startDaemon(self, node): print node.daemon_dir - comm = "PYTHONPATH=/home/p2p/cs-p2p-next/bt_comm:/home/p2p/cs-p2p-next/bt_comm/start-clients/ python /home/p2p/cs-p2p-next/bt_comm/server/Server.py start " + node.public_address + " " + node.listen_port + comm = "PYTHONPATH=/home/p2p/cs-p2p-next/bt_comm:/home/p2p/cs-p2p-next/bt_comm/start-clients/ python /home/p2p/cs-p2p-next/bt_comm/server/Server.py start " + node.private_address + " " + node.listen_port print comm #self.printDummyCommand(node.public_address, node.public_port, node.ssh_port, comm) self.sendSSHComm(node.public_address, node.username, int(node.ssh_port), comm) diff --git a/auto/db/.gitignore b/ppf/db/.gitignore similarity index 100% rename from auto/db/.gitignore rename to ppf/db/.gitignore diff --git a/auto/db/DatabaseAccess.py b/ppf/db/DatabaseAccess.py similarity index 100% rename from auto/db/DatabaseAccess.py rename to ppf/db/DatabaseAccess.py diff --git a/auto/db/DatabaseCommander.py b/ppf/db/DatabaseCommander.py similarity index 100% rename from auto/db/DatabaseCommander.py rename to ppf/db/DatabaseCommander.py diff --git a/auto/db/DatabaseWriter.py b/ppf/db/DatabaseWriter.py similarity index 100% rename from auto/db/DatabaseWriter.py rename to ppf/db/DatabaseWriter.py diff --git a/auto/db/README b/ppf/db/README similarity index 100% rename from auto/db/README rename to ppf/db/README diff --git a/auto/db/client_sessions.sample.txt b/ppf/db/client_sessions.sample.txt similarity index 100% rename from auto/db/client_sessions.sample.txt rename to ppf/db/client_sessions.sample.txt diff --git a/auto/db/db_init b/ppf/db/db_init similarity index 100% rename from auto/db/db_init rename to ppf/db/db_init diff --git a/auto/db/julian.py b/ppf/db/julian.py similarity index 100% rename from auto/db/julian.py rename to ppf/db/julian.py diff --git a/auto/db/sidereal.py b/ppf/db/sidereal.py similarity index 100% rename from auto/db/sidereal.py rename to ppf/db/sidereal.py diff --git a/auto/db/status_messages.sample.txt b/ppf/db/status_messages.sample.txt similarity index 100% rename from auto/db/status_messages.sample.txt rename to ppf/db/status_messages.sample.txt diff --git a/auto/db/swarms.sample.txt b/ppf/db/swarms.sample.txt similarity index 100% rename from auto/db/swarms.sample.txt rename to ppf/db/swarms.sample.txt diff --git a/auto/db/verbose_messages.sample.txt b/ppf/db/verbose_messages.sample.txt similarity index 100% rename from auto/db/verbose_messages.sample.txt rename to ppf/db/verbose_messages.sample.txt diff --git a/auto/extra/db_init.py b/ppf/extra/db_init.py similarity index 100% rename from auto/extra/db_init.py rename to ppf/extra/db_init.py diff --git a/log-parser/libtorrent/LogParser.py b/ppf/log-parser/libtorrent/LogParser.py similarity index 100% rename from log-parser/libtorrent/LogParser.py rename to ppf/log-parser/libtorrent/LogParser.py diff --git a/log-parser/libtorrent/README b/ppf/log-parser/libtorrent/README similarity index 100% rename from log-parser/libtorrent/README rename to ppf/log-parser/libtorrent/README diff --git a/log-parser/libtorrent/StatusParser.py b/ppf/log-parser/libtorrent/StatusParser.py similarity index 100% rename from log-parser/libtorrent/StatusParser.py rename to ppf/log-parser/libtorrent/StatusParser.py diff --git a/log-parser/libtorrent/run_sample b/ppf/log-parser/libtorrent/run_sample similarity index 100% rename from log-parser/libtorrent/run_sample rename to ppf/log-parser/libtorrent/run_sample diff --git a/log-parser/tribler/LogParser.py b/ppf/log-parser/tribler/LogParser.py similarity index 100% rename from log-parser/tribler/LogParser.py rename to ppf/log-parser/tribler/LogParser.py diff --git a/log-parser/tribler/StatusParser.py b/ppf/log-parser/tribler/StatusParser.py similarity index 100% rename from log-parser/tribler/StatusParser.py rename to ppf/log-parser/tribler/StatusParser.py diff --git a/log-parser/tribler/make_db b/ppf/log-parser/tribler/make_db similarity index 100% rename from log-parser/tribler/make_db rename to ppf/log-parser/tribler/make_db diff --git a/log-parser/tribler/run_sample b/ppf/log-parser/tribler/run_sample similarity index 100% rename from log-parser/tribler/run_sample rename to ppf/log-parser/tribler/run_sample diff --git a/log-parser/tribler/run_sample_verbose b/ppf/log-parser/tribler/run_sample_verbose similarity index 100% rename from log-parser/tribler/run_sample_verbose rename to ppf/log-parser/tribler/run_sample_verbose diff --git a/log-samples/libtorrent/141.85.224.222_50200.log b/ppf/log-samples/libtorrent/141.85.224.222_50200.log similarity index 100% rename from log-samples/libtorrent/141.85.224.222_50200.log rename to ppf/log-samples/libtorrent/141.85.224.222_50200.log diff --git a/log-samples/libtorrent/libtorrent-status.sample.log b/ppf/log-samples/libtorrent/libtorrent-status.sample.log similarity index 100% rename from log-samples/libtorrent/libtorrent-status.sample.log rename to ppf/log-samples/libtorrent/libtorrent-status.sample.log diff --git a/log-samples/tribler/log/smth.txt b/ppf/log-samples/tribler/log/smth.txt similarity index 100% rename from log-samples/tribler/log/smth.txt rename to ppf/log-samples/tribler/log/smth.txt diff --git a/log-samples/tribler/log/test1_verbose_msg_request.log b/ppf/log-samples/tribler/log/test1_verbose_msg_request.log similarity index 100% rename from log-samples/tribler/log/test1_verbose_msg_request.log rename to ppf/log-samples/tribler/log/test1_verbose_msg_request.log diff --git a/log-samples/tribler/log/test2.txt b/ppf/log-samples/tribler/log/test2.txt similarity index 100% rename from log-samples/tribler/log/test2.txt rename to ppf/log-samples/tribler/log/test2.txt diff --git a/log-samples/tribler/log/test2_verbose_msg.log b/ppf/log-samples/tribler/log/test2_verbose_msg.log similarity index 100% rename from log-samples/tribler/log/test2_verbose_msg.log rename to ppf/log-samples/tribler/log/test2_verbose_msg.log diff --git a/auto/sql/.gitignore b/ppf/sql/.gitignore similarity index 100% rename from auto/sql/.gitignore rename to ppf/sql/.gitignore diff --git a/auto/sql/README b/ppf/sql/README similarity index 100% rename from auto/sql/README rename to ppf/sql/README diff --git a/auto/sql/p2p-log-sqlite.sql b/ppf/sql/p2p-log-sqlite.sql similarity index 100% rename from auto/sql/p2p-log-sqlite.sql rename to ppf/sql/p2p-log-sqlite.sql diff --git a/auto/util/julian.py b/ppf/util/julian.py similarity index 100% rename from auto/util/julian.py rename to ppf/util/julian.py diff --git a/auto/util/sidereal.py b/ppf/util/sidereal.py similarity index 100% rename from auto/util/sidereal.py rename to ppf/util/sidereal.py diff --git a/viewer/DbObjects.py b/ppf/viewer/DbObjects.py similarity index 100% rename from viewer/DbObjects.py rename to ppf/viewer/DbObjects.py diff --git a/viewer/README b/ppf/viewer/README similarity index 100% rename from viewer/README rename to ppf/viewer/README diff --git a/viewer/config.py b/ppf/viewer/config.py similarity index 100% rename from viewer/config.py rename to ppf/viewer/config.py diff --git a/viewer/mpleditor.py b/ppf/viewer/mpleditor.py similarity index 100% rename from viewer/mpleditor.py rename to ppf/viewer/mpleditor.py diff --git a/viewer/p2p-nexteditor.py b/ppf/viewer/p2p-nexteditor.py similarity index 100% rename from viewer/p2p-nexteditor.py rename to ppf/viewer/p2p-nexteditor.py diff --git a/viewer/run_viewer b/ppf/viewer/run_viewer similarity index 100% rename from viewer/run_viewer rename to ppf/viewer/run_viewer -- 2.20.1