1 files changed, 46 insertions, 40 deletions

diff --git a/bbot/agent/machine.cxx b/bbot/agent/machine.cxx
index 2d9ad4f..74c9b93 100644
--- a/bbot/agent/machine.cxx
+++ b/bbot/agent/machine.cxx
@@ -83,9 +83,9 @@ namespace bbot
   }
 
   static string
-  create_tap (const string& br, uint16_t port)
+  create_tap (const string& br, uint16_t machine_num, uint16_t port)
   {
-    string t ("tap" + to_string (offset));
+    string t ("tap" + to_string (offset + machine_num));
 
     tracer trace ("create_tap", t.c_str ());
 
@@ -126,8 +126,10 @@ namespace bbot
     string bridge; // Bridge interface to which this tap belongs
     uint16_t port; // UDP port to forward TFTP traffic to.
 
-    tap (string b, uint16_t p)
-        : iface (create_tap (b, p)), bridge (move (b)), port (p) {}
+    tap (string b, uint16_t machine_num, uint16_t p)
+        : iface (create_tap (b, machine_num, p)),
+          bridge (move (b)),
+          port (p) {}
 
     ~tap ()
     {
@@ -169,11 +171,13 @@ namespace bbot
   public:
     kvm_machine (const dir_path&,
                  const machine_manifest&,
+                 uint16_t machine_num,
+                 size_t cpus,
+                 size_t ram,
                  const optional<string>& mac,
                  const string& br_iface,
                  uint16_t tftp_port,
-                 bool pub_vnc,
-                 optional<size_t> boost_cpus = nullopt);
+                 bool pub_vnc);
 
     virtual bool
     shutdown (size_t& seconds) override;
@@ -214,31 +218,47 @@ namespace bbot
   kvm_machine::
   kvm_machine (const dir_path& md,
                const machine_manifest& mm,
+               uint16_t m_num,
+               size_t cpus,
+               size_t ram,
                const optional<string>& omac,
                const string& br,
-               uint16_t port,
-               bool pub_vnc,
-               optional<size_t> bcpus)
+               uint16_t tftp_port,
+               bool pub_vnc)
       : machine (mm.mac ? *mm.mac : // Fixed mac from machine manifest.
                  omac   ? *omac   : // Generated mac from previous bootstrap.
                  generate_mac ()),
         kvm ("kvm"),
-        net (br, port),
-        vnc (machine_vnc (pub_vnc)),
+        net (br, m_num, tftp_port),
+        vnc (machine_vnc (m_num, pub_vnc)),
         monitor ("/tmp/monitor-" + tc_name + '-' + to_string (inst))
   {
     tracer trace ("kvm_machine", md.string ().c_str ());
 
+    // Monitor path.
+    //
+    if (m_num != 0)
+    {
+      monitor += '-';
+      monitor += to_string (m_num);
+    }
+
     if (sizeof (sockaddr_un::sun_path) <= monitor.size ())
       throw invalid_argument ("monitor unix socket path too long");
 
     // Machine name.
     //
     // While we currently can only have one running machine per toolchain, add
-    // the instance number for debuggability.
+    // the instance number and non-0 machine number for debuggability.
     //
     string name (mm.name + '-' + tc_name + '-' + to_string (inst));
 
+    if (m_num != 0)
+    {
+      name += '-';
+      name += to_string (m_num);
+    }
+
     // Machine log. Note that it is only removed with an explicit cleanup()
     // call.
     //
@@ -252,7 +272,7 @@ namespace bbot
     // Note that for best results you may want to adjust (e.g., by over-
     // committing) the number of CPUs to be power of 2.
     //
-    size_t cpus (bcpus ? *bcpus : ops.cpu ()), cores (cpus);
+    size_t cores (cpus);
 
     size_t sockets (cores >= 256 && cores % 8 == 0 ? 4 :
                     cores >= 128 && cores % 4 == 0 ? 2 : 1);
@@ -261,26 +281,6 @@ namespace bbot
     size_t threads (cores >= 16 && cores % 4 == 0 ? 2 : 1);
     cores /= threads;
 
-    // We probably don't want to commit all the available RAM to the VM since
-    // some of it could be used on the host side for caching, etc. So the
-    // heuristics that we will use is 4G or 1G per CPU, whichever is greater
-    // and the rest divide equally between the host and the VM.
-    //
-    // But the experience showed that we actually want to be able to precisely
-    // control the amount of RAM assigned to VMs (e.g., for tmpfs size) and
-    // without back-fudging for this heuristics.
-    //
-#if 0
-    size_t ram ((cpus < 4 ? 4 : cpus) * 1024 * 1024); // Kb.
-
-    if (ram > ops.ram ())
-      ram = ops.ram ();
-    else
-      ram += (ops.ram () - ram) / 2;
-#else
-    size_t ram (ops.build_ram ());
-#endif
-
     // If we have options, use that instead of the default network and
     // disk configuration.
     //
@@ -434,7 +434,7 @@ namespace bbot
       // collision-wise with anything useful.
       //
       "-vnc",
-      (pub_vnc ? ":" : "127.0.0.1:") + to_string (offset), // 5900 + offset
+      (pub_vnc ? ":" : "127.0.0.1:") + to_string (offset + m_num), // 5900-base
 
       // QMP.
       //
@@ -672,31 +672,37 @@ namespace bbot
   unique_ptr<machine>
   start_machine (const dir_path& md,
                  const machine_manifest& mm,
+                 uint16_t machine_num,
+                 size_t cpus,
+                 size_t ram,
                  const optional<string>& mac,
                  const string& br_iface,
                  uint16_t tftp_port,
-                 bool pub_vnc,
-                 optional<size_t> bcpus)
+                 bool pub_vnc)
   {
+    assert (machine_num < 10);
+
     switch (mm.type)
     {
     case machine_type::kvm:
       return make_unique<kvm_machine> (
-        md, mm, mac, br_iface, tftp_port, pub_vnc, bcpus);
+        md, mm, machine_num, cpus, ram, mac, br_iface, tftp_port, pub_vnc);
 
     case machine_type::nspawn:
-      assert (false); //@@ TODO
+      assert (false); // @@ TODO
     }
 
     return nullptr;
   }
 
   string
-  machine_vnc (bool pub)
+  machine_vnc (uint16_t num, bool pub)
   {
+    assert (num < 10);
+
     string r (pub ? hip : "127.0.0.1");
     r += ':';
-    r += to_string (5900 + offset);
+    r += to_string (5900 + offset + num);
     return r;
   }
 }