electrostatic-examples: applied API changes on the examples

Author: pavly-gerges

electrostatic-sandbox-framework/electrostatic-examples/src/linux/hello_file_read.c

@@ -49,10 +49,12 @@ static inline void on_bytes_processed(file_mem *mem,
     if (caller != &read_into_mem) {
         return;
     }
-    fprintf(stdout, "Read bytes = %s\n", mem->buffer);
 }
 
-static inline void on_eof_reached(file_mem *mem) {
+static inline void on_eof_reached(file_mem *mem, void *caller) {
+    if (caller != &read_into_mem) {
+        return;
+    }
     // support for stdin
     if (mem->fd == STDIN_FILENO && mem->n_bytes < 20) {
         mem->n_bytes += mem->n_bytes;
@@ -61,6 +63,13 @@ static inline void on_eof_reached(file_mem *mem) {
     }
     fprintf(stdout, "Read Bytes after EOF: %s\n", mem->buffer);
     fprintf(stdout, "EOF Reached!\n");
+}
+
+static inline void op_postprocessor(file_mem *mem, void *caller) {
+    if (&read_into_mem != caller) {
+        return;
+    }
+
     // deallocates memory here!
     if (NULL != mem->buffer) {
         free(mem->buffer);
@@ -87,9 +96,10 @@ int main() {
         .__continue_after_eof = 0
     };
 
-    read_op_processor _processor = {
+    op_processor _processor = {
         .on_bytes_processed = &on_bytes_processed,
-        .on_eof_reached = &on_eof_reached
+        .on_trailing_char_sampled = &on_eof_reached,
+        .op_postprocessor = &op_postprocessor
     };
 
     update_op_processor __processor = {

electrostatic-sandbox-framework/electrostatic-examples/src/linux/hello_file_write.c

@@ -11,8 +11,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 
-static inline void update_model_preprocessor(file_mem *mem,
-                                             void *caller) {
+static inline void op_preprocessor(file_mem *mem, void *caller) {
     if (caller != &write_from_mem) {
         return;
     }
@@ -43,12 +42,14 @@ static inline void on_bytes_processed(file_mem *mem, ssize_t bytes,
     fprintf(stdout, "%s", mem->buffer);
 }
 
-static inline void on_eob_reached(file_mem *mem) {
+static inline void on_eob_reached(file_mem *mem, void *caller) {
+    if (caller != &write_from_mem) {
+        return;
+    }
     fprintf(stdout, "EOB Reached!\n");
 }
 
-static inline void update_model_postprocessor(file_mem *mem,
-                                              void *caller) {
+static inline void op_postprocessor(file_mem *mem, void *caller) {
     if (caller != &write_from_mem) {
         return;
     }
@@ -69,17 +70,14 @@ int main() {
             .__auto_update_attrs = 1,
     };
 
-    write_op_processor _processor = {
+    op_processor _processor = {
             .on_bytes_processed = &on_bytes_processed,
-            .on_eob_reached = &on_eob_reached,
-    };
-
-    update_op_processor __processor = {
-            .update_model_preprocessor = &update_model_preprocessor,
-            .update_model_postprocessor = &update_model_postprocessor,
+            .on_trailing_char_sampled = &on_eob_reached,
+            .op_preprocessor = &op_preprocessor,
+            .op_postprocessor = &op_postprocessor
     };
 
-    status_code __status = write_from_mem(&_file_mem, &_processor, &__processor);
+    status_code __status = write_from_mem(&_file_mem, &_processor, NULL);
 
     if (PASS != __status) {
         fprintf(stderr, "Error Encountered: %s\n", strerror(__status));

electrostatic-sandbox-framework/electrostatic-examples/src/linux/hello_process_serialization.c

@@ -17,7 +17,17 @@ static inline void on_error_encountered(file_mem *mem, int err, void *caller) {
     fprintf(stderr, "%s\n", strerror(err));
 }
 
-static inline void on_eof_reached(file_mem *mem) {
+static inline void op_postprocessor(file_mem *mem, void *caller) {
+    close(mem->fd);
+
+    if (&read_into_mem != caller) {
+        return;
+    }
+    free(mem->buffer);
+    mem->buffer = NULL;
+}
+
+static inline void on_eof_reached(file_mem *mem, void *caller) {
     // -------- Start the polling block --------
     uint8_t __predicate = mem->bytes_processed == 0;
     if (__predicate) {
@@ -27,19 +37,15 @@ static inline void on_eof_reached(file_mem *mem) {
     }
     // -------- End of the polling block --------
     fprintf(stdout, "Read process = %s\n", mem->buffer);
-    free(mem->buffer);
-    mem->buffer = NULL;
     mem->__continue_after_eof = 0;
 
-    close(mem->fd);
 }
 
-static inline void on_eob_reached(file_mem *mem) {
+static inline void on_eob_reached(file_mem *mem, void *caller) {
     fprintf(stdout, "Write process = %s", mem->buffer);
-    close(mem->fd);
 }
 
-static inline void on_last_char_sampled(file_mem *mem, void *caller) {
+static inline void on_last_byte_sampled(file_mem *mem, void *caller) {
     mem->n_bytes += mem->n_bytes;
     mem->buffer = realloc(mem->buffer, sizeof (char) * (mem->n_bytes));
 }
@@ -49,19 +55,22 @@ static inline void on_bytes_processed(file_mem *mem, ssize_t bytes,
 }
 
 static inline void writing_process(pipe_serializer *serializer) {
+    fprintf(stdout, "%s\n", "Started the writing process...");
 
     serializer->write_end.buffer = "Hello From the Electrostatic-Sandbox SDK Pipe Serializer...\n";
     serializer->write_end.n_bytes = strlen(serializer->write_end.buffer) + 1;
 
     sleep(10); // simulate jobs by sleeping the process
 
-    write_from_mem(&serializer->write_end, &(write_op_processor ) {
-       .on_eob_reached = &on_eob_reached,
-       .on_bytes_processed = &on_bytes_processed
+    write_from_mem(&serializer->write_end, &(op_processor) {
+       .on_trailing_char_sampled = &on_eob_reached,
+       .on_bytes_processed = &on_bytes_processed,
+       .op_postprocessor = &op_postprocessor
     }, NULL);
 }
 
 static inline void reading_process(pipe_serializer *serializer) {
+    fprintf(stdout, "%s\n", "Started the reading process...");
 
     serializer->read_end.n_bytes = 2;
     serializer->read_end.buffer = calloc(serializer->read_end.n_bytes, sizeof (char));
@@ -71,11 +80,12 @@ static inline void reading_process(pipe_serializer *serializer) {
         exit(errno);
     }
 
-    status_code __status = read_into_mem(&serializer->read_end, &(read_op_processor) {
-        .on_eof_reached = &on_eof_reached,
-        .on_last_char_sampled = &on_last_char_sampled,
+    status_code __status = read_into_mem(&serializer->read_end, &(op_processor) {
+        .on_trailing_char_sampled = &on_eof_reached,
+        .on_last_byte_sampled = &on_last_byte_sampled,
         .on_bytes_processed = &on_bytes_processed,
-        .on_error_encountered = &on_error_encountered
+        .on_error_encountered = &on_error_encountered,
+        .op_postprocessor = &op_postprocessor
     }, NULL);
 
     if (PASS != __status) {
@@ -88,21 +98,20 @@ static inline void serializer_init_preprocessor(pipe_serializer *serializer) {
     // preprocessing check the file and remove it if it exists
     // for the test and the showcase
 
+    serializer->write_end.fd = open("/home/pavl-g/Desktop/test.txt", O_RDWR | O_CREAT);
+    serializer->read_end.fd = open("/home/pavl-g/Desktop/test.txt", O_RDONLY);
 }
 
 static inline void serializer_init_postprocessor(pipe_serializer *serializer) {
     // do the read/write testing here!
-    serializer->write_end.fd = open("/home/pavl-g/Desktop/test.txt", O_RDWR | O_CREAT);
-    serializer->read_end.fd = open("/home/pavl-g/Desktop/test.txt", O_RDONLY);
-
     // start another process
     pid_t pid = fork();
     if (pid > 0) { // parent process
         writing_process(serializer);
     } else if (pid == 0) { // subprocess
         reading_process(serializer);
     } else {
-
+        exit(pid);
     }
 }
 
@@ -120,7 +129,8 @@ int main() {
             .fd = -1,
             .trailing = '\0',
             .buffer = NULL,
-            .n_bytes = -1
+            .n_bytes = -1,
+            .__auto_update_attrs = 0
         }
     };
 
@@ -134,7 +144,7 @@ int main() {
 
     status_code __status_code = init_serializer(&serializer, &_processor, &__processor);
     if (PASS != __status_code) {
-        return __status_code;
+        fprintf(stderr, "%s\n", strerror(__status_code));
     }
 
     return 0;