CSY/reowolf Changeset - e9c737983088 · Centrum Wiskunde & Informatica (CWI)

Changeset - e9c737983088

Parent rev.

Child rev.

[Not reviewed]

2 6 10

Christopher Esterhuyse - 5 years ago 2020-06-25 17:22:16
christopher.esterhuyse@gmail.com

fixing examples

18 files changed with 193 insertions and 210 deletions:

.gitignore

README.md

examples/1_minimal/amy.c

examples/1_minimal/reowolf.h

146

examples/2_runtime_pdl/amy.c

examples/2_runtime_pdl/make.sh

examples/3_trivial_connect/amy.c

examples/3_trivial_connect/make.sh

examples/4_port_pair/amy.c

examples/4_port_pair/make.sh

examples/5_put_get/amy.c

examples/5_put_get/make.sh

examples/6_atomic/amy.c

examples/6_atomic/make.sh

examples/reowolf_rs.dll

bin+mod

main.c

reowolf.h

src/runtime/ffi.rs

0 comments (0 inline, 0 general)

.gitignore

➞

Show inline comments

@@ @@ -2,9 +2,8 @@ target @@
 /.idea
 **/*.rs.bk
 Cargo.lock
 main
 examples/*/*.exe
 examples/*.dll
 examples/*.dll
 examples/reowolf*
 logs
@@ \ No newline at end of file @@

README.md

➞

Show inline comments

@@ @@ -3,6 +3,7 @@ @@
 ## Compilation instructions
 . Install the latest stable Rust toolchain using Rustup. See https://rustup.rs/ for further instructions.
 . Run `cargo build --release` to download source dependencies, and compile the library with release-level optimizations.
 	- The resulting dylib can be found in target/release/, to be used with the header file reowolf.h.
 	- Note: A list of immediate ancestor dependencies is visible in Cargo.toml.
 	- Note: Run `cargo test --release` to run unit tests with release-level optimizations.
 . Running `cbindgen > reowolf.h` from the root will overwrite the header file. (WIP) This is only necessary to update it.
@@ \ No newline at end of file @@

examples/1_minimal/amy.c

➞

Show inline comments

 #include <stdio.h>
 #include <string.h>
 #include "../../reowolf.h"
 #include "../utility.c"
 int main(int argc, char** argv) {
 	char * pdl_ptr = buffer_pdl("eg_protocols.pdl");
 	size_t pdl_len = strlen(pdl_ptr);
 	Arc_ProtocolDescription * pd = protocol_description_parse(pdl_ptr, pdl_len);
 	size_t err_len;
 	printf("Ptr is %p.\nErr is `%s`.\n", pd, reowolf_error_peek(&err_len));
 	free(pdl_ptr);
 	Arc_ProtocolDescription * pd = protocol_description_parse("", 0);
 	Connector * c = connector_new(pd);
 	connector_print_debug(c);
 	protocol_description_destroy(pd);
 	connector_print_debug(c);
 	connector_destroy(c);
 	return 0;
+}
@@ \ No newline at end of file @@

examples/1_minimal/reowolf.h

➞

Show inline comments

deleted file

examples/2_runtime_pdl/amy.c

➞

Show inline comments

@@ new file 100644 @@
 #include <stdio.h>
 #include <string.h>
 #include "../../reowolf.h"
 #include "../utility.c"
 int main(int argc, char** argv) {
 	char * pdl_ptr = buffer_pdl("eg_protocols.pdl");
 	size_t pdl_len = strlen(pdl_ptr);
 	Arc_ProtocolDescription * pd = protocol_description_parse(pdl_ptr, pdl_len);
 	Connector * c = connector_new(pd);
 	connector_print_debug(c);
 	protocol_description_destroy(pd);
 	connector_destroy(c);
 	free(pdl_ptr);
 	return 0;
+}
@@ \ No newline at end of file @@

examples/2_runtime_pdl/make.sh

➞

Show inline comments

@@ new file 100644 @@
 #!/bin/sh
 LIB_PATH="../../target/release"
 gcc -L $LIB_PATH -lreowolf_rs -Wl,-R$LIB_PATH amy.c -o ./amy

examples/3_trivial_connect/amy.c

➞

Show inline comments

@@ new file 100644 @@
 #include <stdio.h>
 #include <string.h>
 #include "../../reowolf.h"
 #include "../utility.c"
 int main(int argc, char** argv) {
 	char * pdl_ptr = buffer_pdl("eg_protocols.pdl");
 	size_t pdl_len = strlen(pdl_ptr);
 	Arc_ProtocolDescription * pd = protocol_description_parse(pdl_ptr, pdl_len);
 	Connector * c = connector_new(pd);
 	connector_connect(c, 100);
 	connector_print_debug(c);
 	protocol_description_destroy(pd);
 	connector_destroy(c);
 	free(pdl_ptr);
 	return 0;
+}
@@ \ No newline at end of file @@

examples/3_trivial_connect/make.sh

➞

Show inline comments

@@ new file 100644 @@
 #!/bin/sh
 LIB_PATH="../../target/release"
 gcc -L $LIB_PATH -lreowolf_rs -Wl,-R$LIB_PATH amy.c -o ./amy

examples/4_port_pair/amy.c

➞

Show inline comments

@@ new file 100644 @@
 #include <stdio.h>
 #include <string.h>
 #include "../../reowolf.h"
 #include "../utility.c"
 int main(int argc, char** argv) {
 	char * pdl_ptr = buffer_pdl("eg_protocols.pdl");
 	size_t pdl_len = strlen(pdl_ptr);
 	Arc_ProtocolDescription * pd = protocol_description_parse(pdl_ptr, pdl_len);
 	Connector * c = connector_new(pd);
 	PortId putter, getter;
 	connector_add_port_pair(c, &putter, &getter);
 	connector_print_debug(c);
 	protocol_description_destroy(pd);
 	connector_destroy(c);
 	free(pdl_ptr);
 	return 0;
+}
@@ \ No newline at end of file @@

examples/4_port_pair/make.sh

➞

Show inline comments

@@ new file 100644 @@
 #!/bin/sh
 LIB_PATH="../../target/release"
 gcc -L $LIB_PATH -lreowolf_rs -Wl,-R$LIB_PATH amy.c -o ./amy

examples/5_put_get/amy.c

➞

Show inline comments

@@ new file 100644 @@
 #include <stdio.h>
 #include <string.h>
 #include "../../reowolf.h"
 #include "../utility.c"
 int main(int argc, char** argv) {
 	char * pdl_ptr = buffer_pdl("eg_protocols.pdl");
 	size_t pdl_len = strlen(pdl_ptr);
 	Arc_ProtocolDescription * pd = protocol_description_parse(pdl_ptr, pdl_len);
 	Connector * c = connector_new(pd);
 	PortId putter, getter;
 	connector_add_port_pair(c, &putter, &getter);
 	connector_connect(c, -1);
 	connector_print_debug(c);
 	connector_put_bytes(c, putter, "hello", 5);
 	connector_get(c, getter);
 	connector_sync(c, -1);
 	size_t msg_len;
 	const char * msg_ptr = connector_gotten_bytes(c, getter, &msg_len);
 	printf("Got msg `%.*s`\n", msg_len, msg_ptr);
 	protocol_description_destroy(pd);
 	connector_destroy(c);
 	free(pdl_ptr);
 	return 0;
+}
@@ \ No newline at end of file @@

examples/5_put_get/make.sh

➞

Show inline comments

@@ new file 100644 @@
 #!/bin/sh
 LIB_PATH="../../target/release"
 gcc -L $LIB_PATH -lreowolf_rs -Wl,-R$LIB_PATH amy.c -o ./amy

examples/6_atomic/amy.c

➞

Show inline comments

@@ new file 100644 @@
 #include <stdio.h>
 #include <string.h>
 #include "../../reowolf.h"
 #include "../utility.c"
 int main(int argc, char** argv) {
 	char * pdl_ptr = buffer_pdl("eg_protocols.pdl");
 	size_t pdl_len = strlen(pdl_ptr);
 	Arc_ProtocolDescription * pd = protocol_description_parse(pdl_ptr, pdl_len);
 	Connector * c = connector_new(pd);
 	PortId putter, getter;
 	connector_add_port_pair(c, &putter, &getter);
 	connector_connect(c, -1);
 	connector_print_debug(c);
 	printf("Let's try to put without get\n");
 	connector_put_bytes(c, putter, "hello", 5);
 	// connector_get(c, getter);
 	int err = connector_sync(c, 5000);
 	printf("Error code %d with string `%s`\n", err, reowolf_error_peek(NULL));
 	printf("Let's try again, doing both\n");
 	connector_put_bytes(c, putter, "hello", 5);
 	connector_get(c, getter);
 	err = connector_sync(c, 5000);
 	printf("Error code %d with string `%s`\n", err, reowolf_error_peek(NULL));
 	size_t msg_len;
 	const char * msg_ptr = connector_gotten_bytes(c, getter, &msg_len);
 	printf("Got msg `%.*s`\n", msg_len, msg_ptr);
 	protocol_description_destroy(pd);
 	connector_destroy(c);
 	free(pdl_ptr);
 	return 0;
+}
@@ \ No newline at end of file @@

examples/6_atomic/make.sh

➞

Show inline comments

@@ new file 100644 @@
 #!/bin/sh
 LIB_PATH="../../target/release"
 gcc -L $LIB_PATH -lreowolf_rs -Wl,-R$LIB_PATH amy.c -o ./amy

examples/reowolf_rs.dll

➞

Show inline comments

binary diff not shown

main.c

➞

Show inline comments

deleted file

reowolf.h

➞

Show inline comments

@@ @@ -19,24 +19,24 @@ typedef enum { @@
 } Polarity;
 typedef struct Arc_ProtocolDescription Arc_ProtocolDescription;
 typedef struct Connector Connector;
 typedef struct Payload Payload;
 typedef int32_t ErrorCode;
 typedef uint32_t ConnectorId;
 typedef uint32_t PortSuffix;
 typedef struct {
   ConnectorId connector_id;
   PortSuffix u32_suffix;
 } PortId;
 } Id;
 typedef Id PortId;
 /**
  * Given
  * - an initialized connector in setup or connecting state,
  * - a string slice for the component's identifier in the connector's configured protocol description,
  * - a set of ports (represented as a slice; duplicates are ignored) in the native component's interface,
  * The connector uses the given (internal) connector ID.
  */
 Connector *connector_new_with_id(const Arc_ProtocolDescription *pd, ConnectorId cid);
 intptr_t connector_next_batch(Connector *connector);
 void connector_print_debug(Connector *connector);
 /**
  * Convenience function combining the functionalities of
  * "payload_new" with "connector_put_payload".
  */
 ErrorCode connector_put_bytes(Connector *connector,
                               PortId port,
                               const uint8_t *bytes_ptr,
                               uintptr_t bytes_len);
 ErrorCode connector_put_payload(Connector *connector, PortId port, Payload *payload);
 ErrorCode connector_put_payload_cloning(Connector *connector, PortId port, const Payload *payload);
 intptr_t connector_sync(Connector *connector, int64_t timeout_millis);
 /**
  * Given an initialized protocol description, initializes `out` with a clone which can be independently created or destroyed.
  */
 Arc_ProtocolDescription *protocol_description_clone(const Arc_ProtocolDescription *pd);
 /**
  * Returns length (via out pointer) and pointer (via return value) of the last Reowolf error.
  * - pointer is NULL iff there was no last error
  * - data at pointer is null-delimited
  * - len does NOT include the length of the null-delimiter
  * If len is NULL, it will not written to.
  */
 const uint8_t *reowolf_error_peek(uintptr_t *len);
 #endif /* REOWOLF_HEADER_DEFINED */

src/runtime/ffi.rs

➞

Show inline comments

@@ @@ -67,16 +67,19 @@ type ErrorCode = i32; @@
 ///////////////////// REOWOLF //////////////////////////
 /// Returns length (via out pointer) and pointer (via return value) of the last Reowolf error.
 /// - pointer is NULL iff there was no last error
 /// - data at pointer is null-delimited
 /// - len does NOT include the length of the null-delimiter
 /// If len is NULL, it will not written to.
 #[no_mangle]
 pub unsafe extern "C" fn reowolf_error_peek(len: *mut usize) -> *const u8 {
     let (err_ptr, err_len) = StoredError::tl_bytes_peek();
     if !len.is_null() {
         len.write(err_len);
+    }
     err_ptr
+}
 ///////////////////// PROTOCOL DESCRIPTION //////////////////////////
 /// Parses the utf8-encoded string slice to initialize a new protocol description object.
@@ @@ -117,12 +120,17 @@ pub unsafe extern "C" fn protocol_description_clone( @@
 /// given an initialized protocol description.
 #[no_mangle]
 pub unsafe extern "C" fn connector_new(pd: &Arc<ProtocolDescription>) -> *mut Connector {
     connector_new_with_id(pd, random_connector_id())
+}
 #[no_mangle]
 pub unsafe extern "C" fn connector_print_debug(connector: &mut Connector) {
     println!("Debug print dump {:#?}", connector);
+}
 /// Initializes `out` with a new connector using the given protocol description as its configuration.
 /// The connector uses the given (internal) connector ID.
 #[no_mangle]
 pub unsafe extern "C" fn connector_new_with_id(
     pd: &Arc<ProtocolDescription>,
     cid: ConnectorId,
@@ @@ -240,41 +248,41 @@ pub unsafe extern "C" fn connector_connect( @@
             StoredError::tl_debug_store(&err);
             -1
+        }
+    }
+}
 #[no_mangle]
 pub unsafe extern "C" fn connector_put_payload(
     connector: &mut Connector,
     port: PortId,
     payload: *mut Payload,
 ) -> ErrorCode {
     match connector.put(port, payload.read()) {
         Ok(()) => 0,
         Err(err) => {
             StoredError::tl_debug_store(&err);
             -1
+        }
+    }
+}
 // #[no_mangle]
 // pub unsafe extern "C" fn connector_put_payload(
 //     connector: &mut Connector,
 //     port: PortId,
 //     payload: *mut Payload,
 // ) -> ErrorCode {
 //     match connector.put(port, payload.read()) {
 //         Ok(()) => 0,
 //         Err(err) => {
 //             StoredError::tl_debug_store(&err);
 //             -1
 //         }
 //     }
 // }
 #[no_mangle]
 pub unsafe extern "C" fn connector_put_payload_cloning(
     connector: &mut Connector,
     port: PortId,
     payload: &Payload,
 ) -> ErrorCode {
     match connector.put(port, payload.clone()) {
         Ok(()) => 0,
         Err(err) => {
             StoredError::tl_debug_store(&err);
             -1
+        }
+    }
+}
 // #[no_mangle]
 // pub unsafe extern "C" fn connector_put_payload_cloning(
 //     connector: &mut Connector,
 //     port: PortId,
 //     payload: &Payload,
 // ) -> ErrorCode {
 //     match connector.put(port, payload.clone()) {
 //         Ok(()) => 0,
 //         Err(err) => {
 //             StoredError::tl_debug_store(&err);
 //             -1
 //         }
 //     }
 // }
 /// Convenience function combining the functionalities of
 /// "payload_new" with "connector_put_payload".
 #[no_mangle]
 pub unsafe extern "C" fn connector_put_bytes(
     connector: &mut Connector,

0 comments (0 inline, 0 general)