OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

analyze-migration.py: replace numpy with python 3.2

Browse Source 
Use int.from_bytes() from python 3.2 instead.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20191127101038.327080-3-marcandre.lureau@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Cleber Rosa <crosa@redhat.com>
This commit is contained in:
Marc-André Lureau 2019-11-27 14:10:38 +04:00 committed by Cleber Rosa
parent 13ae8cdb9b
commit 83de0ea4ad
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
scripts/analyze-migration.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
#
# Migration Stream Analyzer
#
@ -17,12 +17,18 @@
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
import numpy as np
import json
import os
import argparse
import collections
import struct
import sys
MIN_PYTHON = (3, 2)
if sys.version_info < MIN_PYTHON:
sys.exit("Python %s.%s or later is required.\n" % MIN_PYTHON)
def mkdir_p(path):
try:
@ -30,29 +36,26 @@ def mkdir_p(path):
except OSError:
pass
class MigrationFile(object):
def __init__(self, filename):
self.filename = filename
self.file = open(self.filename, "rb")
def read64(self):
return np.asscalar(np.fromfile(self.file, count=1, dtype='>i8')[0])
return int.from_bytes(self.file.read(8), byteorder='big', signed=True)
def read32(self):
return np.asscalar(np.fromfile(self.file, count=1, dtype='>i4')[0])
return int.from_bytes(self.file.read(4), byteorder='big', signed=True)
def read16(self):
return np.asscalar(np.fromfile(self.file, count=1, dtype='>i2')[0])
return int.from_bytes(self.file.read(2), byteorder='big', signed=True)
def read8(self):
return np.asscalar(np.fromfile(self.file, count=1, dtype='>i1')[0])
return int.from_bytes(self.file.read(1), byteorder='big', signed=True)
def readstr(self, len = None):
if len is None:
len = self.read8()
if len == 0:
return ""
return np.fromfile(self.file, count=1, dtype=('S%d' % len))[0]
return self.readvar(len).decode('utf-8')
def readvar(self, size = None):
if size is None:
@ -275,7 +278,7 @@ class VMSDFieldGeneric(object):
return str(self.__str__())
def __str__(self):
return " ".join("{0:02x}".format(ord(c)) for c in self.data)
return " ".join("{0:02x}".format(c) for c in self.data)
def getDict(self):
return self.__str__()
@ -307,8 +310,8 @@ class VMSDFieldInt(VMSDFieldGeneric):
def read(self):
super(VMSDFieldInt, self).read()
self.sdata = np.fromstring(self.data, count=1, dtype=(self.sdtype))[0]
self.udata = np.fromstring(self.data, count=1, dtype=(self.udtype))[0]
self.sdata = int.from_bytes(self.data, byteorder='big', signed=True)
self.udata = int.from_bytes(self.data, byteorder='big', signed=False)
self.data = self.sdata
return self.data
@ -363,7 +366,7 @@ class VMSDFieldStruct(VMSDFieldGeneric):
array_len = field.pop('array_len')
field['index'] = 0
new_fields.append(field)
for i in xrange(1, array_len):
for i in range(1, array_len):
c = field.copy()
c['index'] = i
new_fields.append(c)