Skip to content
Snippets Groups Projects
Commit 651db87b authored by NGUYEN Do Duc Anh's avatar NGUYEN Do Duc Anh
Browse files

optimize code, need to test

parent 44fbab4f
No related branches found
No related tags found
No related merge requests found
...@@ -283,8 +283,8 @@ def update_neighbor_info(): ...@@ -283,8 +283,8 @@ def update_neighbor_info():
while True: while True:
try: try:
is_notify_neighbor = False
if not update_neighbor_info_queue.empty(): if not update_neighbor_info_queue.empty():
is_notify_neighbor = False
while not update_neighbor_info_queue.empty(): while not update_neighbor_info_queue.empty():
neighbor = update_neighbor_info_queue.get() neighbor = update_neighbor_info_queue.get()
...@@ -297,28 +297,16 @@ def update_neighbor_info(): ...@@ -297,28 +297,16 @@ def update_neighbor_info():
map_neighbor[neighbor.id] = neighbor map_neighbor[neighbor.id] = neighbor
old_degree = node.degree old_degree = node.degree
node.degree = len(map_neighbor) node.degree = len(map_neighbor)
if old_degree != node.degree: if old_degree != node.degree:
print("I updated my degree, reset myself") print("I updated my degree, reset myself")
reset_me() reset_me()
is_notify_neighbor = True is_notify_neighbor = True
is_apply_rule = apply_rule() if apply_rule() or is_notify_neighbor:
if is_apply_rule or is_notify_neighbor:
send_node_info()
for neighbor in map_neighbor.values():
message = struct.pack('!IIIIIII', magic_hdr, Cmd.SHARE_INFO, node.myid, node.degree, node.color, node.color_id, node.pointer)
send_packet(neighbor.iface, neighbor.mac, message)
node.converge_time = time.time()
print_my_info()
elif apply_rule():
send_node_info() send_node_info()
print("My current state: ", node.state)
for neighbor in map_neighbor.values(): for neighbor in map_neighbor.values():
message = struct.pack('!IIIIIII', magic_hdr, Cmd.SHARE_INFO, node.myid, node.degree, node.color, node.color_id, node.pointer) message = struct.pack('!IIIIIII', magic_hdr, Cmd.SHARE_INFO, node.myid, node.degree, node.color, node.color_id, node.pointer)
...@@ -326,7 +314,7 @@ def update_neighbor_info(): ...@@ -326,7 +314,7 @@ def update_neighbor_info():
node.converge_time = time.time() node.converge_time = time.time()
print_my_info() print_my_info()
time.sleep(1) time.sleep(1)
except RuntimeError as e: except RuntimeError as e:
print(f"Caught an error: {e}") print(f"Caught an error: {e}")
print("Maybe REPLY_REGISTER received after I send SHARE_INFO message") print("Maybe REPLY_REGISTER received after I send SHARE_INFO message")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment