Skip to content

Commit 1a9b00e

Browse files
committed
Remove pause/resume feature (i can't find the way to solve the freeze error, and pause/resume feature is not that important because you can just stop the test)
1 parent 27ad284 commit 1a9b00e

File tree

1 file changed

+0
-55
lines changed
  • pyside_lang_comparison_graph

1 file changed

+0
-55
lines changed

pyside_lang_comparison_graph/main.py

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ class TestThread(QThread):
3030
def __init__(self, n, langs_test_available_dict: dict, res_lst: list):
3131
super().__init__()
3232
# thread control variable
33-
self.__mutex = QMutex()
34-
self.__pauseCondition = QWaitCondition()
35-
self.__paused = False
3633
self.__stopped = False
3734
self.__stoppedCurrentTest = False
3835

@@ -58,21 +55,7 @@ def __init__(self, n, langs_test_available_dict: dict, res_lst: list):
5855
self.__fnt = QFont('Arial', 10)
5956
self.__fnt.setBold(True)
6057

61-
def pause(self):
62-
# todo fix the second lock make app freeze
63-
self.__mutex.lock()
64-
self.__paused = True
65-
self.__mutex.unlock()
66-
67-
def resume(self):
68-
self.__mutex.lock()
69-
self.__paused = False
70-
self.__mutex.unlock()
71-
self.__pauseCondition.wakeAll()
72-
7358
def stop(self):
74-
if self.__paused:
75-
self.resume()
7659
self.__stopped = True
7760

7861
# stop current language's test
@@ -97,9 +80,6 @@ def run(self):
9780
self.updated.emit(f"Test Stopped", QColor(155, 0, 0), self.__fnt)
9881
self.__stopped = False
9982
return
100-
# pause
101-
if self.__paused:
102-
self.__pauseCondition.wait(self.__mutex)
10383
realtime_output = self.__p.stdout.readline()
10484
if realtime_output == '' and self.__p.poll() is not None or self.__stoppedCurrentTest:
10585
break
@@ -126,24 +106,9 @@ class TestMonitorThread(QThread):
126106
def __init__(self):
127107
super().__init__()
128108
self.__mutex = QMutex()
129-
self.__pauseCondition = QWaitCondition()
130-
self.__paused = False
131109
self.__stopped = False
132110

133-
def pause(self):
134-
self.__mutex.lock()
135-
self.__paused = True
136-
self.__mutex.unlock()
137-
138-
def resume(self):
139-
self.__mutex.lock()
140-
self.__paused = False
141-
self.__mutex.unlock()
142-
self.__pauseCondition.wakeAll()
143-
144111
def stop(self, pid=None):
145-
if self.__paused:
146-
self.resume()
147112
if pid:
148113
os.kill(pid, signal.SIGINT)
149114
self.__stopped = True
@@ -153,8 +118,6 @@ def run(self) -> None:
153118
if self.__stopped or psutil.virtual_memory().percent > 100:
154119
self.__stopped = False
155120
return
156-
if self.__paused:
157-
self.__pauseCondition.wait(self.__mutex)
158121

159122
def resetTime(self):
160123
self.__resetFlag = True
@@ -251,13 +214,10 @@ def __initUi(self):
251214
self.__logLbl.setText('Running the test...')
252215
self.__logBrowser = QTextBrowser()
253216

254-
self.__pauseBtn = QPushButton('Pause')
255-
self.__pauseBtn.clicked.connect(self.__testPauseToggle)
256217
self.__stopBtn = QPushButton('Stop')
257218
self.__stopBtn.clicked.connect(self.__stop)
258219

259220
lay = QHBoxLayout()
260-
lay.addWidget(self.__pauseBtn)
261221
lay.addWidget(self.__stopBtn)
262222
lay.setContentsMargins(0, 0, 0, 0)
263223
btnWidget = QWidget()
@@ -370,18 +330,6 @@ def __updateLog(self, line, color, font):
370330
vBar = self.__logBrowser.verticalScrollBar()
371331
vBar.setValue(vBar.maximum())
372332

373-
def __testPauseToggle(self):
374-
if self.__pauseBtn.text() == 'Pause':
375-
self.__logLbl.setText('Test paused')
376-
self.__pauseBtn.setText('Resume')
377-
self.__testThread.pause()
378-
self.__usageMoniterThread.pause()
379-
elif self.__pauseBtn.text() == 'Resume':
380-
self.__logLbl.setText('Running the test...')
381-
self.__pauseBtn.setText('Pause')
382-
self.__testThread.resume()
383-
self.__usageMoniterThread.resume()
384-
385333
def __stop(self):
386334
self.__testThread.stop()
387335
pid = self.__testThread.currentProcessPid()
@@ -395,8 +343,6 @@ def __handleTestStarted(self):
395343
self.__runTestBtn.setEnabled(False)
396344
self.__settingsBtn.setEnabled(False)
397345
self.__saveBtn.setEnabled(False)
398-
self.__pauseBtn.setEnabled(True)
399-
self.__pauseBtn.setText('Pause')
400346
self.__stopBtn.setEnabled(True)
401347
self.__usageMoniterThread.start()
402348

@@ -408,7 +354,6 @@ def __handleTestFinished(self):
408354
self.__runTestBtn.setEnabled(True)
409355
self.__settingsBtn.setEnabled(True)
410356
self.__saveBtn.setEnabled(True)
411-
self.__pauseBtn.setEnabled(False)
412357
self.__stopBtn.setEnabled(False)
413358
if self.__isTestFinished():
414359
self.__logLbl.setText('Finished')

0 commit comments

Comments
 (0)