From 070788a680ab50f0bb3a04f9efc2e76a686eccce Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 14 Jan 2015 12:16:49 +0800
Subject: [PATCH] separate master modules

---
 artiq/master/__init__.py                    | 0
 artiq/{management => master}/rt_results.py  | 0
 artiq/{management => master}/scheduler.py   | 2 +-
 artiq/{management => master}/worker.py      | 2 +-
 artiq/{management => master}/worker_impl.py | 0
 frontend/artiq_master.py                    | 4 ++--
 6 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 artiq/master/__init__.py
 rename artiq/{management => master}/rt_results.py (100%)
 rename artiq/{management => master}/scheduler.py (98%)
 rename artiq/{management => master}/worker.py (97%)
 rename artiq/{management => master}/worker_impl.py (100%)

diff --git a/artiq/master/__init__.py b/artiq/master/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/artiq/management/rt_results.py b/artiq/master/rt_results.py
similarity index 100%
rename from artiq/management/rt_results.py
rename to artiq/master/rt_results.py
diff --git a/artiq/management/scheduler.py b/artiq/master/scheduler.py
similarity index 98%
rename from artiq/management/scheduler.py
rename to artiq/master/scheduler.py
index 407b6bdea..50266a9f0 100644
--- a/artiq/management/scheduler.py
+++ b/artiq/master/scheduler.py
@@ -2,7 +2,7 @@ import asyncio
 from time import time
 
 from artiq.management.sync_struct import Notifier
-from artiq.management.worker import Worker
+from artiq.master.worker import Worker
 
 
 class Scheduler:
diff --git a/artiq/management/worker.py b/artiq/master/worker.py
similarity index 97%
rename from artiq/management/worker.py
rename to artiq/master/worker.py
index aa6d4ec99..b2d611255 100644
--- a/artiq/management/worker.py
+++ b/artiq/master/worker.py
@@ -26,7 +26,7 @@ class Worker:
     @asyncio.coroutine
     def create_process(self):
         self.process = yield from asyncio.create_subprocess_exec(
-            sys.executable, "-m", "artiq.management.worker_impl",
+            sys.executable, "-m", "artiq.master.worker_impl",
             stdout=subprocess.PIPE, stdin=subprocess.PIPE)
 
     @asyncio.coroutine
diff --git a/artiq/management/worker_impl.py b/artiq/master/worker_impl.py
similarity index 100%
rename from artiq/management/worker_impl.py
rename to artiq/master/worker_impl.py
diff --git a/frontend/artiq_master.py b/frontend/artiq_master.py
index 9dae6e65b..a5462b55a 100755
--- a/frontend/artiq_master.py
+++ b/frontend/artiq_master.py
@@ -7,8 +7,8 @@ import atexit
 from artiq.management.pc_rpc import Server
 from artiq.management.sync_struct import Publisher
 from artiq.management.db import FlatFileDB, SimpleHistory
-from artiq.management.scheduler import Scheduler
-from artiq.management.rt_results import RTResults
+from artiq.master.scheduler import Scheduler
+from artiq.master.rt_results import RTResults
 
 
 def _get_args():