Changeset b8c3505

Timestamp:

Jan 12, 2012, 2:35:57 AM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

c94fa32

Parents:

adf8cf0

git-author:

Jessica B. Hamrick <jhamrick@…> (01/12/12 02:35:57)

git-committer:

Jessica B. Hamrick <jhamrick@…> (01/12/12 02:35:57)

Message:

Better threading with job.py and player.py

Location:

server/lib/gutenbach/server

Files:

• job.py (modified) (3 diffs)
• player.py (modified) (3 diffs)

server/lib/gutenbach/server/job.py

@@ -323 +323 @@
 
     def cancel(self):
-        """Non-blocking cancel. The job must not have been previously
+        """Blocking cancel. The job must not have been previously
         aborted or completed (though this method will succeed if it
         was previously cancelled).  This should be used to stop the
@@ -335 +335 @@
         """
         
-        def _cancelled():
-            logger.info("cancelled job %s" % str(self))
-            self._why_done = "cancelled"
-
         if self.is_playing:
-            self.player.callback = _cancelled
+            self.player._callback = None
             self.player.mplayer_stop()
+
         elif self.is_done and not self._why_done == "cancelled":
             raise errors.InvalidJobStateException(self.state)
-        else:
-            _cancelled()
+
+        logger.info("cancelled job %s" % str(self))
+        self._why_done = "cancelled"
 
     def abort(self):
-        """Non-blocking abort. The job must not have been previously
+        """Blocking abort. The job must not have been previously
         cancelled or completed (though this method will succeed if it
         was previously aborted).  This should be used to stop the job
@@ -360 +358 @@
         """
 
-        def _aborted():
-            logger.info("aborted job %s" % str(self))
-            self._why_done = "aborted"
-
         if self.is_playing:
-            self.player.callback = _aborted
+            self.player._callback = None
             self.player.mplayer_stop()
+
         elif self.is_done and not self._why_done == "aborted":
             raise errors.InvalidJobStateException(self.state)
-        else:
-            _aborted()
+
+        logger.info("aborted job %s" % str(self))
+        self._why_done = "aborted"
 
     def restart(self):

server/lib/gutenbach/server/player.py

@@ -61 +61 @@
             raise ValueError, "file handler is None"
         
-        self.mplayer_play()
-        self._done = True
+        logger.info("playing file '%s'" % self.fh.name)
+
         with self.lock:
-            if self.callback:
-                self.callback()
-
-    def mplayer_play(self):
-        if not self.isAlive():
-            return
-        
-        logger.info("playing file '%s'" % self.fh.name)
-        self._paused = False
+            self._paused = False
+            self._done = False
 
         if self._dryrun:
@@ -81 +74 @@
                 while self.is_paused:
                     time.sleep(0.01)
-            return
+
+        else:
+            # open mplayer
+            with self.lock:
+                self.player = subprocess.Popen(
+                    "/usr/bin/mplayer -really-quiet -slave %s" % self.fh.name,
+                    shell=True,
+                    stdin=subprocess.PIPE,
+                    stderr=subprocess.PIPE,
+                    stdout=subprocess.PIPE)
+
+            # wait for mplayer to finish
+            while True:
+                with self.lock:
+                    playing = self.is_playing
+                if not playing:
+                    break
+                time.sleep(0.1)
+
+            logger.info("mplayer finished with code %d" % self.player.returncode)
         
-        # open mplayer
+            # get output from mplayer and log it
+            with self.lock:
+                stderr = self.player.stderr.read()
+                stdout = self.player.stdout.read()
+            
+            if stderr.strip() != "":
+                logger.error(stderr)
+            if stdout.strip() != "":
+                logger.debug(stdout)
+
         with self.lock:
-            self.player = subprocess.Popen(
-                "/usr/bin/mplayer -really-quiet -slave %s" % self.fh.name,
-                shell=True,
-                stdin=subprocess.PIPE,
-                stderr=subprocess.PIPE,
-                stdout=subprocess.PIPE)
-
-        # wait for mplayer to finish
-        while True:
-            with self.lock:
-                playing = self.is_playing
-            if not playing:
-                break
-            time.sleep(0.1)
-
-        logger.info("mplayer finished with code %d" % self.player.returncode)
-        
-        # get output from mplayer and log it
-        with self.lock:
-            stderr = self.player.stderr.read()
-            stdout = self.player.stdout.read()
-            
-        if stderr.strip() != "":
-            logger.error(stderr)
-        if stdout.strip() != "":
-            logger.debug(stdout)
+            if self.callback:
+                self.callback()
+            self._done = True
 
     def mplayer_pause(self):
@@ -133 +131 @@
             else:
                 logger.warning("trying to stop non-playing job")
-        time.sleep(self._lag)
+        self.join()