vacp2p/research
1
0
Fork 0
mirror of https://github.com/vacp2p/research.git synced 2025-02-24 12:18:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

more compact sync state and misc

Browse Source
This commit is contained in:
Oskar Thoren 2019-01-09 08:56:36 -05:00
parent a8d979ec09
commit 6054250603
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
data_sync/sync.py
View File

@ -34,7 +34,7 @@ class NetworkSimulator():
self.queue = {} self.queue = {}
self.peers = {} self.peers = {}
# Global network reliability # Global network reliability
self.reliability = 0.9 self.reliability = 1 # 0.95? Dunno.
def tick(self): def tick(self):
if self.time in self.queue: if self.time in self.queue:
@ -175,19 +175,25 @@ class Node():
self.sync_state[ack][sender.name]["hold_flag"] = 1 self.sync_state[ack][sender.name]["hold_flag"] = 1
def print_sync_state(self): def print_sync_state(self):
#log("{}'s view of .other peer".format(self.name)) log("\n{} POV @{}".format(self.name, self.time))
#log("---------------------------") log("-" * 60)
n = self.name n = self.name
for message_id, x in self.sync_state.items(): for message_id, x in self.sync_state.items():
line = message_id[:4] + " | "
for peer, flags in x.items(): for peer, flags in x.items():
m = message_id[:4] line += peer + ": "
r = flags['request_flag'] if flags['hold_flag']:
h = flags['hold_flag'] line += "hold "
a = flags['ack_flag'] if flags['ack_flag']:
c = flags['send_count'] line += "ack "
t = flags['send_time'] if flags['request_flag']:
log("{}(view of {}): {} | hold={} req={} ack={} time={} count={}".format(n, peer, m, h, r, a, t, c)) line += "req "
#log("---------------------------") line += "@" + str(flags['send_time'])
line += "(" + str(flags['send_count']) + ")"
line += " | "
log(line)
log("-" * 60)
# XXX: Self-describing better in practice, format? # XXX: Self-describing better in practice, format?
@ -245,7 +251,7 @@ def run(steps=10):
a = Node("A", n, 0.1) # mobile a = Node("A", n, 0.1) # mobile
b = Node("B", n, 0.1) # mobile b = Node("B", n, 0.1) # mobile
c = Node("C", n, 0.9) # desktop/server c = Node("C", n, 1) # desktop/server
n.peers["A"] = a n.peers["A"] = a
n.peers["B"] = b n.peers["B"] = b
@ -284,8 +290,9 @@ def run(steps=10):
peer.append_message(rec) peer.append_message(rec)
n.tick() n.tick()
#a.print_sync_state() a.print_sync_state()
#b.print_sync_state() #b.print_sync_state()
#c.print_sync_state()
# XXX: This confuses things somewhat, as this is # XXX: This confuses things somewhat, as this is
# client concerns # client concerns
@ -301,9 +308,6 @@ def run(steps=10):
print "B POV:", acc print "B POV:", acc
run()
## TODO: Sync modes, interactive (+bw -latency) and batch (v.v.) ## TODO: Sync modes, interactive (+bw -latency) and batch (v.v.)
# Need to encode logic for actions taken at given time, # Need to encode logic for actions taken at given time,
@ -362,3 +366,10 @@ ex = {'payload': "hello_world",
# XXX: How will C receive the message from A to B? # XXX: How will C receive the message from A to B?
# TODO: Requires offering to B, e.g. # TODO: Requires offering to B, e.g.
# Or B requesting it # Or B requesting it
# Why is A sending same message to C over again
# and again, with reliability = 1,1?
# C no op? it acks but A ignores it?
# Duh, C sends but A doesn't see it...
run(5)