Merge branch 'dev'

Author: dominickpastore

CHANGELOG.md

@@ -4,6 +4,18 @@ Changelog
 [Unreleased]
 ------------
 
+[2.0.2] - 2021-07-22
+--------------------
+
+### Changed
+
+- Automated tests updated for some of the more recent changes
+- Added an intro to the docs explaining what the project is about
+
+### Fixed
+
+- No warning about unusued PEDL events when used in an unnamed channel
+
 [2.0.1] - 2021-07-07
 --------------------
 
@@ -96,6 +108,7 @@ This is the first version in the changelog, and the last version of SMEDL 1.x.
   between the monitoring system and the target system
 
 [Unreleased]: https://gitlab.precise.seas.upenn.edu/smedl/smedl/compare/master...v2.0.1
+[2.0.2]: https://gitlab.precise.seas.upenn.edu/smedl/smedl/compare/v2.0.2...v2.0.1
 [2.0.1]: https://gitlab.precise.seas.upenn.edu/smedl/smedl/compare/v2.0.1...v2.0.0
 [2.0.0]: https://gitlab.precise.seas.upenn.edu/smedl/smedl/compare/v2.0.0...v1.1.1
 [1.1.1]: https://gitlab.precise.seas.upenn.edu/smedl/smedl/-/tags/v1.1.1

TODO.md

@@ -2,7 +2,7 @@
 	"title" : "smedl",
 	"summary" : "A tool for generating software monitors from SMEDL and PEDL definitions.",
 	"uri" : "https://gitlab.precise.seas.upenn.edu/smedl/smedl",
-	"version" : "2.0.1",
+	"version" : "2.0.2",
 	"author" : "The Trustees of the University of Pennsylvania",
         "author_email": "pgeb@seas.upenn.edu",
         "maintainer": "Dominick C. Pastore",

smedl/about.json

@@ -224,7 +224,7 @@ int localcreation_{{conn.channel}}_{{target.mon_string}}(SMEDLValue *identities,
     }
     {% for var, param in target.state_vars.items() %}
     {% set array_name = "identities" if param.identity else "params" %}
-    if (!set_{{target.monitor.name}}_{{var.name}}(new_identities, {{array_name}}[{{param.index}}])) {
+    if (!set_{{target.monitor.name}}_{{var}}(new_identities, {{array_name}}[{{param.index}}])) {
         goto fail;
     }
     {% endfor %}

smedl/codegen/global_wrapper.c

@@ -192,7 +192,7 @@ void free_{{mon.name}}_local_wrapper(void) {
  * Return nonzero on success or if monitor already exists, zero on failure.
  *
  * Parameters:
- * identites - An array of SMEDLValue of the proper length for this monitor.
+ * identities - An array of SMEDLValue of the proper length for this monitor.
  *   Must be fully specified; no wildcards. */
 int create_{{mon.name}}(SMEDLValue *identities) {
     {% if mon.params is nonempty %}
@@ -240,7 +240,7 @@ int create_{{mon.name}}(SMEDLValue *identities) {
  * failure.
  *
  * Parameters:
- * identites - An array of SMEDLValue of the proper length for this monitor.
+ * identities - An array of SMEDLValue of the proper length for this monitor.
  * value - The value to assign to the state variable. */
 {% for var in spec.state_vars.values() %}
 
@@ -264,7 +264,7 @@ int set_{{mon.name}}_{{var.name}}(SMEDLValue *identities, SMEDLValue value) {
  * Return nonzero on success, zero on failure.
  *
  * Parameters:
- * identites - An array of SMEDLValue of the proper length for this monitor.
+ * identities - An array of SMEDLValue of the proper length for this monitor.
  *   Wildcards can be represented with a SMEDLValue of type SMEDL_NULL.
  * params - An array of SMEDLValue, one for each parameter of the event.
  * aux - Extra data that is passed through to exported events unchanged. */

smedl/codegen/local_wrapper.c

@@ -23,15 +23,15 @@ void free_{{mon.name}}_local_wrapper(void);
  * Return nonzero on success or if monitor already exists, zero on failure.
  *
  * Parameters:
- * identites - An array of SMEDLValue of the proper length for this monitor. */
+ * identities - An array of SMEDLValue of the proper length for this monitor. */
 int create_{{mon.name}}(SMEDLValue *identities);
 
 /* State variable interface - Set the value of the respective state variable.
  * Intended to be used right after monitor creation.
  * Return nonzero on success, zero if the monitor does not exist.
  *
  * Parameters:
- * identites - An array of SMEDLValue of the proper length for this monitor.
+ * identities - An array of SMEDLValue of the proper length for this monitor.
  * value - The value to assign to the state variable. */
 {% for var_name in spec.state_vars.keys() %}
 int set_{{mon.name}}_{{var_name}}(SMEDLValue *identities, SMEDLValue value);
@@ -42,7 +42,7 @@ int set_{{mon.name}}_{{var_name}}(SMEDLValue *identities, SMEDLValue value);
  * Return nonzero on success, zero on failure.
  *
  * Parameters:
- * identites - An array of SMEDLValue of the proper length for this monitor.
+ * identities - An array of SMEDLValue of the proper length for this monitor.
  * params - An array of SMEDLValue, one for each parameter of the event.
  * aux - Extra data that is passed through to exported events unchanged. */
 {% for event in spec.imported_events.keys() %}

smedl/codegen/local_wrapper.h

@@ -30,7 +30,8 @@ char **smedl_argv;
  * variables. Sensible defaults are provided, but the target program can
  * override them if desired. */
 int smedl_argc = 1;
-char **smedl_argv = {"{{syncset}}", NULL};
+char *smedl_argv_default[] = {"{{syncset}}", NULL};
+char **smedl_argv = smedl_argv_default;
 {% endif %}
 
 /* Manager event queue */
@@ -136,9 +137,9 @@ int process_queue(void) {
                 {% if conn.source_mon is not none %}
                 {% for param_type in conn.source_mon.params %}
                 {% if param_type is sameas SmedlType.STRING %}
-                free(identites[{{loop.index0}}].v.s);
+                free(identities[{{loop.index0}}].v.s);
                 {% elif param_type is sameas SmedlType.OPAQUE %}
-                free(identites[{{loop.index0}}].v.o.data);
+                free(identities[{{loop.index0}}].v.o.data);
                 {% endif %}
                 {% endfor %}
                 {% endif %}
@@ -157,9 +158,9 @@ int process_queue(void) {
                 {% if conn.source_mon is not none %}
                 {% for param_type in conn.source_mon.params %}
                 {% if param_type is sameas SmedlType.STRING %}
-                free(identites[{{loop.index0}}].v.s);
+                free(identities[{{loop.index0}}].v.s);
                 {% elif param_type is sameas SmedlType.OPAQUE %}
-                free(identites[{{loop.index0}}].v.o.data);
+                free(identities[{{loop.index0}}].v.o.data);
                 {% endif %}
                 {% endfor %}
                 {% endif %}

smedl/codegen/manager.c

@@ -168,7 +168,7 @@ if (!smedl_replace_string(&mon->s.{{a.var}}, {{expression(a.expr)}})) {
     /* malloc fail */
     return 0;
 }
-{%- elif spec.state_vars[a.var].type is sameas SmedlType.STRING %}
+{%- elif spec.state_vars[a.var].type is sameas SmedlType.OPAQUE %}
 if (!smedl_replace_opaque(&mon->s.{{a.var}}, {{expression(a.expr)}})) {
     /* malloc fail */
     return 0;

smedl/codegen/mon.c

@@ -142,10 +142,10 @@ int smedl_assign_opaque(SMEDLOpaque *dest, SMEDLOpaque src) {
     if (tmp == NULL && src.size != 0) {
         return 0;
     }
-    (*dest).data = tmp;
-    (*dest).size = src.size;
+    dest->data = tmp;
+    dest->size = src.size;
     if (src.size != 0) {
-        memcpy((*dest).data, src.data, src.size);
+        memcpy(dest->data, src.data, src.size);
     }
     return 1;
 }
@@ -170,11 +170,11 @@ int smedl_replace_opaque(SMEDLOpaque *dest, SMEDLOpaque src) {
     if (tmp == NULL && src.size != 0) {
         return 0;
     }
-    free((*dest).data);
-    (*dest).data = tmp;
-    (*dest).size = src.size;
+    free(dest->data);
+    dest->data = tmp;
+    dest->size = src.size;
     if (src.size != 0) {
-        memcpy((*dest).data, src.data, src.size);
+        memcpy(dest->data, src.data, src.size);
     }
     return 1;
 }