Next stage of the sim loop rewrite - actually use the new ourSims->simsLua.

Still in debugging mode.

1 files changed, 76 insertions, 2 deletions

diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c
index c158a61..2f282f9 100644
--- a/src/sledjchisl/sledjchisl.c
+++ b/src/sledjchisl/sledjchisl.c
@@ -1212,7 +1212,7 @@ simList *getSims()
   size_t l = strlen(tnm);
 
   ourSims->simsLua = Lua2tree(file, "sims");
-  dumpLuaTree(ourSims->simsLua, "simsLua", 0);
+//  dumpLuaTree(ourSims->simsLua, "simsLua", 0);
 
   if (s)
   {
@@ -7818,10 +7818,84 @@ sims =  -- Note these are .shini / tmux tab short names.
   {["type"] = "Heavies"; ["number"] = 18; "DP", "ARSE"},
 }
 */
+  qtreetbl_obj_t obj0, obj1;
+  qLua *q0, *q1;
+  int count = 0, window = 0, panes = 4, pane = 0;
+
+  memset((void*)&obj0, 0, sizeof(obj0));
+  ourSims->simsLua->lock(ourSims->simsLua);
+  while(ourSims->simsLua->getnext(ourSims->simsLua, &obj0, false) == true)
+  {
+    q0 = obj0.data;
+    char *type = "unsorted";
+
+    if (LUA_TTABLE == q0->type)
+    {
+      panes = 4;
+      q1 = q0->v.t->get(q0->v.t, "number",      NULL, false);  if (NULL != q1)  window  = q1->v.f - 1;
+      q1 = q0->v.t->get(q0->v.t, "panes",       NULL, false);  if (NULL != q1)  panes   = q1->v.f;
+      q1 = q0->v.t->get(q0->v.t, "type",        NULL, false);  if (NULL != q1)  type    = q1->v.s;
+      if (0 == panes)
+      {
+        pane = 2;
+        window = 0;
+      }
+      else if (0 != pane)
+      {
+        pane = 0;
+        window++;
+      }
+
+      T("Doing sims of type %s, window %d, %d panes per window.  %d", type, window, panes, pane);
+      memset((void*)&obj1, 0, sizeof(obj1));
+      q0->v.t->lock(q0->v.t);
+      while(q0->v.t->getnext(q0->v.t, &obj1, false) == true)
+      {
+        q1 = obj1.data;
+
+        if ((strcmp("number", obj1.name) != 0) && (strcmp("panes", obj1.name) != 0) && (strcmp("type", obj1.name) != 0))
+        {
+          char *sim = q1->v.s;
+          qlisttbl_t *ini = ourSims->byTab->get(ourSims->byTab, sim, NULL, false);
+
+          if (NULL == ini)
+            E("Sim %s not found in ini list!", sim);
+          else
+          {
+            simData *simd = ini->get(ini, "SIM DATA", NULL, false);
+            char *nm = simd->tab;
+            char *name = simd->name;
+
+            simd->window = window;
+            simd->pane = pane;
+            I("%s is starting up in tab [%d:%s](pane %d), tmux ID = %s, from %s/sim%d.", name, window, type, pane, simd->paneID, scTemp, count);
+
+
+
+            count++;
+          }
+
+          pane++;
+          if (pane >= panes)
+          {
+            pane = 0;
+            window++;
+          }
+        }
+      }
+      q0->v.t->unlock(q0->v.t);
+    }
+  }
+  ourSims->simsLua->unlock(ourSims->simsLua);
+goto finished;
+
+
+
+
   snprintf(toybuf, sizeof(toybuf), "%s/sims.lua", scEtc);
   if (0 == lstat(toybuf, &st))
   {
-    int count = 0, window = 0, panes = 4, pane = 0;
+//    int count = 0, window = 0, panes = 4, pane = 0;
 
     I("Loading sims file - %s", toybuf);
     status = luaL_loadfile(L, toybuf);