From db0f36f4315c8cea9ebdb81d6a60d05ce6b6fc5b Mon Sep 17 00:00:00 2001
From: Brian O'Connor <bocon@onlab.us>
Date: Wed, 13 Aug 2014 19:49:08 -0700
Subject: [PATCH] Fixing Node.monitor() to read entire prompt marker.
Applying @cdburkard fix to #322
---
mininet/node.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/mininet/node.py b/mininet/node.py
index d5b30362..a69eda61 100644
--- a/mininet/node.py
+++ b/mininet/node.py
@@ -261,6 +261,9 @@ def monitor( self, timeoutms=None, findPid=True ):
# Look for PID
marker = chr( 1 ) + r'\d+\r\n'
if findPid and chr( 1 ) in data:
+ # Marker can be read in chunks; continue until all of it is read
+ while not re.findall( marker, data ):
+ data += self.read( 1024 )
markers = re.findall( marker, data )
if markers:
self.lastPid = int( markers[ 0 ][ 1: ] )
--
GitLab