Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qmemman: trigger do_balance() on receiving /proc/meminfo data

Browse Source
This commit is contained in:
Rafal Wojtczuk 2010-09-09 12:36:18 +02:00
parent f4e46b63a4
commit 51e14fc8bb
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom0/qmemman/qmemman.py
View File

@ -96,6 +96,7 @@ class SystemState:
def refresh_meminfo(self, domid, val): def refresh_meminfo(self, domid, val):
qmemman_algo.refresh_meminfo_for_domain(self.domdict[domid], val) qmemman_algo.refresh_meminfo_for_domain(self.domdict[domid], val)
self.do_balance()
def is_balance_req_significant(self, memset_reqs): def is_balance_req_significant(self, memset_reqs):
total_memory_transfer = 0 total_memory_transfer = 0

17
dom0/qmemman/qmemman_server.py
View File

@ -9,7 +9,6 @@ from qmemman import SystemState
system_state = SystemState() system_state = SystemState()
global_lock = thread.allocate_lock() global_lock = thread.allocate_lock()
additional_balance_delay = 0
def only_in_first_list(l1, l2): def only_in_first_list(l1, l2):
ret=[] ret=[]
@ -75,7 +74,6 @@ class QMemmanReqHandler(SocketServer.BaseRequestHandler):
""" """
def handle(self): def handle(self):
global additional_balance_delay
got_lock = False got_lock = False
# self.request is the TCP socket connected to the client # self.request is the TCP socket connected to the client
while True: while True:
@ -92,7 +90,6 @@ class QMemmanReqHandler(SocketServer.BaseRequestHandler):
got_lock = True got_lock = True
if system_state.do_balloon(int(self.data)): if system_state.do_balloon(int(self.data)):
resp = "OK\n" resp = "OK\n"
additional_balance_delay = 5
else: else:
resp = "FAIL\n" resp = "FAIL\n"
self.request.send(resp) self.request.send(resp)
@ -109,22 +106,8 @@ def start_server():
os.umask(077) os.umask(077)
server.serve_forever() server.serve_forever()
def start_balancer():
global additional_balance_delay
while True:
time.sleep(1)
if additional_balance_delay != 0:
print 'waiting additional_balance_delay to allow VM to start'
time.sleep(additional_balance_delay)
additional_balance_delay = 0
global_lock.acquire()
if additional_balance_delay == 0:
system_state.do_balance()
global_lock.release()
class QMemmanServer: class QMemmanServer:
@staticmethod @staticmethod
def main(): def main():
thread.start_new_thread(start_server, tuple([])) thread.start_new_thread(start_server, tuple([]))
thread.start_new_thread(start_balancer, tuple([]))
XS_Watcher().watch_loop() XS_Watcher().watch_loop()