Cleanup dead (non-async) code and rename functions.

Signed-off-by: William D. Jones <thor0505@comcast.net>

sbysrc/sby_core.py

@@ -124,79 +124,6 @@ class SbyTask:
             all_tasks_running.remove(self)
         self.terminated = True
 
-    def poll(self):
-        if self.finished or self.terminated:
-            return
-
-        if not self.running:
-            for dep in self.deps:
-                if not dep.finished:
-                    return
-
-            if not self.silent:
-                self.job.log("{}: starting process \"{}\"".format(self.info, self.cmdline))
-
-            if os.name == "posix":
-                def preexec_fn():
-                    signal.signal(signal.SIGINT, signal.SIG_IGN)
-                    os.setpgrp()
-
-                self.p = subprocess.Popen(["/usr/bin/env", "bash", "-c", self.cmdline], stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
-                        stderr=(subprocess.STDOUT if self.logstderr else None), preexec_fn=preexec_fn)
-
-                fl = fcntl.fcntl(self.p.stdout, fcntl.F_GETFL)
-                fcntl.fcntl(self.p.stdout, fcntl.F_SETFL, fl | os.O_NONBLOCK)
-
-            else:
-                self.p = subprocess.Popen(self.cmdline, shell=True, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
-                        stderr=(subprocess.STDOUT if self.logstderr else None))
-
-            self.job.tasks_pending.remove(self)
-            self.job.tasks_running.append(self)
-            all_tasks_running.append(self)
-            self.running = True
-            return
-
-        while True:
-            outs = self.p.stdout.readline().decode("utf-8")
-            if len(outs) == 0: break
-            if outs[-1] != '\n':
-                self.linebuffer += outs
-                break
-            outs = (self.linebuffer + outs).strip()
-            self.linebuffer = ""
-            self.handle_output(outs)
-
-        if self.p.poll() is not None:
-            if not self.silent:
-                self.job.log("{}: finished (returncode={})".format(self.info, self.p.returncode))
-            self.job.tasks_running.remove(self)
-            all_tasks_running.remove(self)
-            self.running = False
-
-            if self.p.returncode == 127:
-                self.job.status = "ERROR"
-                if not self.silent:
-                    self.job.log("{}: COMMAND NOT FOUND. ERROR.".format(self.info))
-                self.terminated = True
-                self.job.terminate()
-                return
-
-            self.handle_exit(self.p.returncode)
-
-            if self.checkretcode and self.p.returncode != 0:
-                self.job.status = "ERROR"
-                if not self.silent:
-                    self.job.log("{}: job failed. ERROR.".format(self.info))
-                self.terminated = True
-                self.job.terminate()
-                return
-
-            self.finished = True
-            for next_task in self.notify:
-                next_task.poll()
-            return
-
     async def output_async(self):
         while True:
             outs = await self.p.stdout.readline()
@@ -210,7 +137,7 @@ class SbyTask:
             self.linebuffer = ""
             self.handle_output(outs)
 
-    async def maybe_spawn_async(self):
+    async def maybe_spawn(self):
         if self.finished or self.terminated:
             return
 
@@ -226,10 +153,10 @@ class SbyTask:
             self.job.tasks_pending.remove(self)
             self.job.tasks_running.append(self)
             self.running = True
-            asyncio.ensure_future(self.output_async())
+            asyncio.ensure_future(self.output())
             self.fut = asyncio.ensure_future(self.p.wait())
 
-    async def shutdown_and_notify_async(self):
+    async def shutdown_and_notify(self):
         self.job.log("%s: finished (returncode=%d)" % (self.info, self.p.returncode))
         self.job.tasks_running.remove(self)
         self.running = False
@@ -245,7 +172,7 @@ class SbyTask:
 
         self.finished = True
         for next_task in self.notify:
-            await next_task.maybe_spawn_async()
+            await next_task.maybe_spawn()
         return
 
 class SbyAbort(BaseException):
@@ -299,37 +226,6 @@ class SbyJob:
                 for line in sbyconfig:
                     print(line, file=f)
 
-    def taskloop(self):
-        for task in self.tasks_pending:
-            task.poll()
-
-        while len(self.tasks_running):
-            fds = []
-            for task in self.tasks_running:
-                if task.running:
-                    fds.append(task.p.stdout)
-
-            if os.name == "posix":
-                try:
-                    select(fds, [], [], 1.0) == ([], [], [])
-                except InterruptedError:
-                    pass
-            else:
-                sleep(0.1)
-
-            for task in self.tasks_running:
-                task.poll()
-
-            for task in self.tasks_pending:
-                task.poll()
-
-            if self.opt_timeout is not None:
-                total_clock_time = int(time() - self.start_clock_time)
-                if total_clock_time > self.opt_timeout:
-                    self.log("Reached TIMEOUT ({} seconds). Terminating all tasks.".format(self.opt_timeout))
-                    self.status = "TIMEOUT"
-                    self.terminate(timeout=True)
-
     def taskloop_async(self):
         if os.name != "posix":
             loop = asyncio.ProactorEventLoop()
@@ -360,7 +256,7 @@ class SbyJob:
             timer_fut.add_done_callback(partial(SbyJob.timeout, self))
 
         for task in self.tasks_pending:
-            await task.maybe_spawn_async()
+            await task.maybe_spawn()
 
         while len(self.tasks_running):
             task_futs = []
@@ -371,7 +267,7 @@ class SbyJob:
 
             for task in self.tasks_running:
                 if task.fut in done:
-                    await task.shutdown_and_notify_async()
+                    await task.shutdown_and_notify()
 
         if self.opt_timeout is not None:
             timer_fut.cancel()
@@ -748,9 +644,7 @@ class SbyJob:
             if opt not in self.used_options:
                 self.error("Unused option: {}".format(opt))
 
-        # self.taskloop()
+        self.taskloop()
-        self.taskloop_async()
-
 
         total_clock_time = int(time() - self.start_clock_time)