esiaccel 0.1.2.dev15__cp38-cp38-win_amd64.whl → 0.1.3__cp38-cp38-win_amd64.whl

esiaccel/bin/esi-cosim.py

@@ -135,7 +135,10 @@ class Simulator:
     """Return the command to run the simulation."""
     assert False, "Must be implemented by subclass"
 
-  def run(self, inner_command: str, gui: bool = False) -> int:
+  def run(self,
+          inner_command: str,
+          gui: bool = False,
+          server_only: bool = False) -> int:
     """Start the simulation then run the command specified. Kill the simulation
     when the command exits."""
 
@@ -197,12 +200,19 @@ class Simulator:
           raise Exception("Simulation exited early")
         time.sleep(0.05)
 
-      # Run the inner command, passing the connection info via environment vars.
-      testEnv = os.environ.copy()
-      testEnv["ESI_COSIM_PORT"] = str(port)
-      testEnv["ESI_COSIM_HOST"] = "localhost"
-      return subprocess.run(inner_command, cwd=os.getcwd(),
-                            env=testEnv).returncode
+      if server_only:
+        # wait for user input to kill the server
+        input(
+            f"Running in server-only mode on port {port} - Press anything to kill the server..."
+        )
+        return 0
+      else:
+        # Run the inner command, passing the connection info via environment vars.
+        testEnv = os.environ.copy()
+        testEnv["ESI_COSIM_PORT"] = str(port)
+        testEnv["ESI_COSIM_HOST"] = "localhost"
+        return subprocess.run(inner_command, cwd=os.getcwd(),
+                              env=testEnv).returncode
     finally:
       # Make sure to stop the simulation no matter what.
       if simProc:
@@ -317,7 +327,10 @@ class Questa(Simulator):
       cmd.append(svLib)
     return cmd
 
-  def run(self, inner_command: str, gui: bool = False) -> int:
+  def run(self,
+          inner_command: str,
+          gui: bool = False,
+          server_only: bool = False) -> int:
     """Override the Simulator.run() to add a soft link in the run directory (to
     the work directory) before running vsim the usual way."""
 
@@ -327,7 +340,7 @@ class Questa(Simulator):
       os.symlink(Path(os.getcwd()) / "work", workDir)
 
     # Run the simulation.
-    return super().run(inner_command, gui)
+    return super().run(inner_command, gui, server_only=server_only)
 
 
 def __main__(args):
@@ -375,6 +388,11 @@ def __main__(args):
                          nargs=argparse.REMAINDER,
                          help="Command to run in the simulation environment.")
 
+  argparser.add_argument(
+      "--server-only",
+      action="store_true",
+      help="Only run the cosim server, and do not run any inner command.")
+
   if len(args) <= 1:
     argparser.print_help()
     return
@@ -398,7 +416,7 @@ def __main__(args):
     rc = sim.compile()
     if rc != 0:
       return rc
-  return sim.run(args.inner_cmd[1:], gui=args.gui)
+  return sim.run(args.inner_cmd[1:], gui=args.gui, server_only=args.server_only)
 
 
 if __name__ == '__main__':

esiaccel/include/esi/Common.h

@@ -105,13 +105,24 @@ public:
   /// Adopts the data vector buffer.
   MessageData() = default;
   MessageData(std::vector<uint8_t> &data) : data(std::move(data)) {}
+  MessageData(std::vector<uint8_t> &&data) : data(std::move(data)) {}
   MessageData(const uint8_t *data, size_t size) : data(data, data + size) {}
   ~MessageData() = default;
 
   const uint8_t *getBytes() const { return data.data(); }
+
+  /// Get the data as a vector of bytes.
+  const std::vector<uint8_t> &getData() const { return data; }
+
+  /// Move the data out of this object.
+  std::vector<uint8_t> takeData() { return std::move(data); }
+
   /// Get the size of the data in bytes.
   size_t getSize() const { return data.size(); }
 
+  /// Returns true if this message contains no data.
+  bool empty() const { return data.empty(); }
+
   /// Cast to a type. Throws if the size of the data does not match the size of
   /// the message. The lifetime of the resulting pointer is tied to the lifetime
   /// of this object.

esiaccel/include/esi/Services.h

@@ -284,6 +284,7 @@ public:
     std::mutex callMutex;
     WriteChannelPort *arg;
     ReadChannelPort *result;
+    bool connected = false;
   };
 
 private:
@@ -307,8 +308,9 @@ public:
              PortMap channels);
 
   public:
-    static Callback *get(AcceleratorConnection &acc, AppID id, BundleType *type,
-                         WriteChannelPort &result, ReadChannelPort &arg);
+    static Callback *get(AcceleratorConnection &acc, AppID id,
+                         const BundleType *type, WriteChannelPort &result,
+                         ReadChannelPort &arg);
 
     /// Connect a callback to code which will be executed when the accelerator
     /// invokes the callback. The 'quick' flag indicates that the callback is

{esiaccel-0.1.2.dev15.dist-info → esiaccel-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: esiaccel
-Version: 0.1.2.dev15
+Version: 0.1.3
 Summary: ESI accelerators runtime
 Author-email: John Demme <John.Demme@microsoft.com>
 License: ==============================================================================

{esiaccel-0.1.2.dev15.dist-info → esiaccel-0.1.3.dist-info}/RECORD

@@ -1,16 +1,16 @@
-esiaccel/CosimBackend.dll,sha256=C-yOIruBUnVMVAhG9LOTqRlroiExp1wHatAEEfESLVU,7161344
-esiaccel/CosimBackend.lib,sha256=dZgNr_bh6UBFYi1UKscDYE5Hen86dlqPYcuOgmxDmgM,4990738
-esiaccel/ESICppRuntime.dll,sha256=dLWBbF1I28UN5_8XLqNUqSR16tvBFSRA1u7gun3cGqs,3691520
-esiaccel/ESICppRuntime.lib,sha256=L6qsGl4zL3tPZ43_Zk8VnklypmpNQeNsj27Hkk72yzQ,14491514
+esiaccel/CosimBackend.dll,sha256=IJWvxPMd06E4ZpPigH3fYjMX8gcgIyNBBuvmugkKy-0,7150592
+esiaccel/CosimBackend.lib,sha256=2qSqISOnyefgUZQPnUoDyDzkpcQVnCf-fjyqLb6aINI,4991546
+esiaccel/ESICppRuntime.dll,sha256=K6RRXXkX-DXkVwxZ2_lAzn6yY2yUgxpNIbTpXC0EO8I,3682304
+esiaccel/ESICppRuntime.lib,sha256=0IylTM7GptXB8Uhwuk4sISzwTnpKfncShSswrVRWgHE,14489550
 esiaccel/__init__.py,sha256=C0GLqCQuF5g5qTzmAkf_YAHmBV2XAyiJad3Qz7h8u1g,562
 esiaccel/accelerator.py,sha256=GM2FRZF_8nzAJ_7TSRSw_kaJCYWCHMK-cQD8ZZU8QVs,3071
 esiaccel/codegen.py,sha256=uoYELtnIabVvgLeCABj-mWras0BvmSKABPH-cd9nDFk,6560
-esiaccel/esiCppAccel.cp38-win_amd64.pyd,sha256=29wxYXyq3CNHt0P7RNIXWC378mSxCtQuKnckC-pCi4A,452096
+esiaccel/esiCppAccel.cp38-win_amd64.pyd,sha256=FSDjWHsw_zz8i6n0HmbXciBcgg2aDGGrB0t2ofHF2NQ,449024
 esiaccel/types.py,sha256=gfUgrX67KYFruX5xsj_wLNJCdwczzLpseyH71M86pW0,17047
 esiaccel/utils.py,sha256=nzar3WALJC_RfmM5v0GeUev5So1-EAYuAMxG9jLj3eQ,1062
-esiaccel/zlib1.dll,sha256=OzBbyd1Rc7lQxe1paTN2ZMrkmRftqJ0XlwAbpJWlC8o,90624
-esiaccel/bin/esi-cosim.py,sha256=Q-eW6S8m5fJsgY__-XlPXxXI8HHYsDDqjTNksrZcK60,13808
-esiaccel/bin/esiquery.exe,sha256=hkHUkcU-c4qAQYkg6LU4MhhV3HlXY3JCH6fcs72kqI8,436224
+esiaccel/zlib1.dll,sha256=GMIWELkSl68cF_4Hv0o5iiAGyiOABmRqDR8uGxOz0DE,90112
+esiaccel/bin/esi-cosim.py,sha256=GwYfNh4aagypheAhGf0EIX6ojkLYKkc5OMlFR9pfXe8,14381
+esiaccel/bin/esiquery.exe,sha256=gYXy_jb38fOiH9aQ1MjoI4Vtsyt7ibRf2Q-05OYY4SA,441856
 esiaccel/cmake/esiaccelConfig.cmake,sha256=u2aW99k1lEcmYTG1P3BTJqtmDrj53wUUaBz_jzw8kYY,565
 esiaccel/cosim/Cosim_DpiPkg.sv,sha256=9qGn1VyAVrzBP5At1thV6xrovg0WghICD01Zz9J221E,3458
 esiaccel/cosim/Cosim_Endpoint.sv,sha256=ri1fHdkiphe8S2-vm6Ru16rBGYiDiS1c8qeCAsl1diU,6498
@@ -19,26 +19,26 @@ esiaccel/cosim/driver.cpp,sha256=DrEKkSN7Y_Hu7wcaUulH5mbC2L4yB9xLClRMeRUpzHM,384
 esiaccel/cosim/driver.sv,sha256=ro-j9GM164A1W0MDPkqYfEn3TUKHSqVvgjO31fnloQI,1428
 esiaccel/include/esi/Accelerator.h,sha256=RhkZ2HeMZ0iHc5BkHdDWXoeg9J9lyPQciH5bWq5Qc_w,9772
 esiaccel/include/esi/CLI.h,sha256=Nn8tHn_xtEfkrD7USE2tao6ktYOJ6xcbnhZkS9-ox0A,2540
-esiaccel/include/esi/Common.h,sha256=GyB9S4GJn-1K4bZNWi6Fc5ftKsL2Y362QOsNYuCqk6I,5078
+esiaccel/include/esi/Common.h,sha256=PKoDU2y2q5zwfeyjW5jfHqRiP6NGPOF3Wn3aOHdmWvM,5468
 esiaccel/include/esi/Context.h,sha256=Tk_4nBDtTeVY62GfX4Cs_ZMIQstjSgrWHddN_PKANEA,2396
 esiaccel/include/esi/Design.h,sha256=mU8OwpCYijiWSdDq17l45LMzZxBca93nosudWCXNHfQ,4922
 esiaccel/include/esi/Engines.h,sha256=bbGbhXjYMpIpXh_DR0OS57zyGQUIDXh_S7xHX3su0Y0,4831
 esiaccel/include/esi/Logging.h,sha256=sHqMcpp0lNIHkIEyvSm-BBWx4zXXh6NOATCgZpgzYI4,8944
 esiaccel/include/esi/Manifest.h,sha256=j3v9UA0ogtJQBlv6k5s4j_3sCsq-gwF9btVg5dKTBlg,2244
 esiaccel/include/esi/Ports.h,sha256=T2WbPBViUSvFbO5Jjxlcp_eGq9jMitguvNnz3O0564U,10543
-esiaccel/include/esi/Services.h,sha256=NyeuBxBzmZLpDoikQsjI-ih5FfVivfepZU9Bt8oi0CE,14721
+esiaccel/include/esi/Services.h,sha256=THgEbqNOuUIo1nonFFVsy_7H58GvPKP0Yw6i-ySPWBA,14782
 esiaccel/include/esi/Types.h,sha256=P4ExO8-zvm7qQocUmkM_ATIvamxtDZ8JT2ToLkFo1dk,5483
 esiaccel/include/esi/Utils.h,sha256=KPd75GajIFeTBVJocXBjwsJqhbZg-ShWZCIe3oQdBss,3061
 esiaccel/include/esi/backends/Cosim.h,sha256=s7vYd0ra6m1nvk-n37MjvBoGVI-CCUKBt0DU4PKlaHM,2838
 esiaccel/include/esi/backends/RpcServer.h,sha256=WMwnhwU2qnrcglGNeiKg9QQHpkDx1QE1JydKYDK4jqE,1856
 esiaccel/include/esi/backends/Trace.h,sha256=kx4wwLH3a0ndmRUdaDyYGZ1SP83zlpFrk30Nw8ZrJJA,3286
-esiaccel/lib/EsiCosimDpiServer.dll,sha256=VcX8Lg4SI7MhKzi-nnkZ8PwUg-7--oVxhmhH1C1vM-g,160768
-esiaccel/lib/EsiCosimDpiServer.lib,sha256=YrKxoXvBjmyrC-yJ7aq4_ePloA9p5X04oXjM8Ers1wY,604164
-esiaccel/lib/MtiPli.dll,sha256=malZNfuXAeZVwAgy1TbDyT87aqrE2KVN4P9U9_Lbz14,14848
-esiaccel/lib/MtiPli.lib,sha256=Q__4sWi51FSc2p1hDaN90G0HstSxRy07z0aaXGd2e_w,14570
-esiaccel-0.1.2.dev15.dist-info/LICENSE,sha256=vtnVnB8_lN1yPYcA5MeT56R8UsQtBhyzZLBvu_KMf7I,13468
-esiaccel-0.1.2.dev15.dist-info/METADATA,sha256=712B79dCCdBUmNFKe41mlMwSbkGW3_3ghjaFq0lzn9c,16126
-esiaccel-0.1.2.dev15.dist-info/WHEEL,sha256=2M046GvC9RLU1f1TWyM-2sB7cRKLhAC7ucAFK8l8f24,99
-esiaccel-0.1.2.dev15.dist-info/entry_points.txt,sha256=_CuNLV0fyTURxRREFwpzGycifZW_-7-MyuJNEwKK9J8,137
-esiaccel-0.1.2.dev15.dist-info/top_level.txt,sha256=fYWTWMDK4PDu4ePQ9NtcFHas2k8-d1kWhTs2avPpgB4,9
-esiaccel-0.1.2.dev15.dist-info/RECORD,,
+esiaccel/lib/EsiCosimDpiServer.dll,sha256=GEDh0hZjwv1G-bjnWzp1v419RsEA-8YdScAvE2uIK4k,159744
+esiaccel/lib/EsiCosimDpiServer.lib,sha256=eFEv_EO7-u7vxUTbURwj0d5rwHNoncITR9P2qJAE1Vk,604164
+esiaccel/lib/MtiPli.dll,sha256=aRI7pBOnO_BQLXiX2EDDqD36-mNNsTwcBuQKT-EFCUo,14848
+esiaccel/lib/MtiPli.lib,sha256=0vBNn5m9C3ulbl8UJ83c0tuxZAKVrB6_B1bQmBE5jc0,14570
+esiaccel-0.1.3.dist-info/LICENSE,sha256=vtnVnB8_lN1yPYcA5MeT56R8UsQtBhyzZLBvu_KMf7I,13468
+esiaccel-0.1.3.dist-info/METADATA,sha256=VE7_B_b1q6p_9dMQlDoYq3-zl9MhMI-DTou9MMEXAhc,16120
+esiaccel-0.1.3.dist-info/WHEEL,sha256=2M046GvC9RLU1f1TWyM-2sB7cRKLhAC7ucAFK8l8f24,99
+esiaccel-0.1.3.dist-info/entry_points.txt,sha256=_CuNLV0fyTURxRREFwpzGycifZW_-7-MyuJNEwKK9J8,137
+esiaccel-0.1.3.dist-info/top_level.txt,sha256=fYWTWMDK4PDu4ePQ9NtcFHas2k8-d1kWhTs2avPpgB4,9
+esiaccel-0.1.3.dist-info/RECORD,,