HDLRuby 2.6.2 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8611332c824fad3b8ad75436070b940389c1d8cf75c66be0842cd5f4efd22340
-  data.tar.gz: 71f3633a674d50a2b4014654d6af82066bc9e8e399e6cdddb733827411ea2787
+  metadata.gz: de0bd759fdbbac53ed126dac38739ef63bdbea435e59f6ebfe9fe35d08475e13
+  data.tar.gz: 9ddbebe786fe3f3f3b6a2db76954f1d8c118cb1913d3487251b9419c1c68c997
 SHA512:
-  metadata.gz: 8316f77bab49fc0899074915a18292f357b45c5e5415b3045f74b80f67260566797e8ffc0edf8b6eaca86340c32adfde49650edddfaa91cad03efd1e6e9f729c
-  data.tar.gz: 117236582bbca17d1ee75a2e3fb4c601ef53b1988f4175a7f77632f9c85a79e5af3e3474463f654c05a48ecdcabd73967d447b90f7640451f1bc3a24d99fd2ec
+  metadata.gz: d22275446a0323c9a27ff0df24d7bb6f684dec195a53f2713176908da81dfc693502bf7649cde756e81726f01dbce910befdc33a623f6022e9e448c559f8bfef
+  data.tar.gz: 8dd6f59d5f0c6898e3e5b71b287900ab3bac0b21154b51acbf14a5959180632d3090fd3979478a5f50bdd418ec09104fb33e4d99059dee7812a16a9aba6f42af

data/lib/HDLRuby/hdrcc.rb

@@ -252,6 +252,20 @@ module HDLRuby
 
 end
 
+# Locate an executable from cmd.
+def which(cmd)
+    # Get the possible exetensions (for windows case).
+    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+    # Look for the command within the executable paths.
+    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts.each do |ext|
+            exe = File.join(path, "#{cmd}#{ext}")
+            return exe if File.executable?(exe) && !File.directory?(exe)
+        end
+    end
+    nil
+end
+
 
 
 if __FILE__ == $0 then
@@ -655,8 +669,19 @@ elsif $options[:clang] then
             end
         end
         Dir.chdir($output)
-        # Kernel.system("make -s")
-        Kernel.system("cc -o3 -o hruby_simulator *.c -lpthread")
+        # Find the compiler.
+        cc_cmd = which('cc')
+        unless cc_cmd then
+            cc_cmd = which('gcc')
+        end
+        unless cc_cmd then
+            raise "Could not find any compiler, please compile by hand as follows:\n" +
+                "   In folder #{$output} execute:\n" +
+                "     <my compiler> -o hruby_simulator *.c -lpthread\n" +
+                "   Then execute:\n   hruby_simulator"
+        end
+        # Use it.
+        Kernel.system("#{cc_cmd} -o3 -o hruby_simulator *.c -lpthread")
         Kernel.system("./hruby_simulator")
     end
 elsif $options[:verilog] then

data/lib/HDLRuby/sim/hruby_sim.h

@@ -451,7 +451,10 @@ typedef struct BehaviorS_ {
 
     int activated;      /* Tells if the behavior is activated or not. */
 
-    int timed;          /* Tell if the behavior is timed or not. */
+    int timed;          /* Tell if the behavior is timed or not:
+                           - 0: not timed
+                           - 1: timed
+                           - 2: timed and finished. */
     unsigned long long active_time; /* The next time the behavior has to be activated. */
     pthread_t thread;   /* The thread assotiated with the behavior (if any).*/
 } BehaviorS;

data/lib/HDLRuby/sim/hruby_sim_core.c

@@ -285,7 +285,8 @@ void hruby_sim_advance_time() {
     int i;
     for(i=0; i<num_timed_behaviors; ++i) {
         unsigned long long beh_time = timed_behaviors[i]->active_time;
-        if (beh_time < next_time) next_time = beh_time;
+        if (timed_behaviors[i]->timed == 1)
+            if (beh_time < next_time) next_time = beh_time;
     }
     /* Sets the new activation time. */
     hruby_sim_time = next_time;
@@ -310,7 +311,9 @@ void hruby_sim_activate_behaviors_on_time() {
     /* Count the number of behaviors that will be activated. */
     for(i=0; i<num_timed_behaviors; ++i) {
         Behavior beh = timed_behaviors[i];
-        if (beh->active_time == hruby_sim_time) {
+        // printf("beh->active_time=%llu\n",beh->active_time);
+        // if (beh->active_time == hruby_sim_time) {
+        if (beh->timed == 1 && beh->active_time == hruby_sim_time) {
             /* Increase the number of timed behavior to wait for. */
             num_active_behaviors ++;
             // printf("num_active_behaviors = %d\n",num_active_behaviors);
@@ -318,18 +321,19 @@ void hruby_sim_activate_behaviors_on_time() {
     }
     /* Activate the behaviors .*/
     behaviors_can_run = 1;
+    // printf("$2\n");
     // pthread_cond_signal(&compute_cond); /* No behaviors. */
-    pthread_cond_signal(&hruby_beh_cond); 
+    // pthread_cond_signal(&hruby_beh_cond); 
     pthread_mutex_unlock(&hruby_sim_mutex);
-    // printf("$2\n");
+    pthread_cond_broadcast(&hruby_beh_cond); 
 }
 
 
 /** Wait for the active timed behaviors to advance. */
 void hruby_sim_wait_behaviors() {
-    // printf("$3\n");
     pthread_mutex_lock(&hruby_sim_mutex);
     while(num_active_behaviors > 0) {
+        // printf("$3\n");
         // printf("num_active_behaviors = %d\n",num_active_behaviors);
         // pthread_cond_wait(&active_behaviors_cond, &hruby_sim_mutex);
         pthread_cond_wait(&hruby_sim_cond, &hruby_sim_mutex);
@@ -349,6 +353,7 @@ void* behavior_run(void* arg) {
     pthread_mutex_lock(&hruby_sim_mutex);
     num_active_behaviors -= 1;
     while(!behaviors_can_run) {
+        // printf("cannot run\n");
         // pthread_cond_wait(&compute_cond, &hruby_sim_mutex);
         pthread_cond_wait(&hruby_beh_cond, &hruby_sim_mutex);
     }
@@ -356,12 +361,17 @@ void* behavior_run(void* arg) {
     // printf("#2\n");
     /* Now can start the execution of the behavior. */
     behavior->block->function();
+    // printf("#3\n");
+    /* Now can start the execution of the behavior. */
     /* Stops the behavior. */
     pthread_mutex_lock(&hruby_sim_mutex);
     num_active_behaviors -= 1;
     num_run_behaviors -= 1;
-    pthread_cond_signal(&hruby_sim_cond);
+    // printf("num_run_behaviors=%d\n",num_run_behaviors);
+    behavior->timed = 2;
+    // pthread_cond_signal(&hruby_sim_cond);
     pthread_mutex_unlock(&hruby_sim_mutex);
+    pthread_cond_signal(&hruby_sim_cond);
     /* End the thread. */
     pthread_exit(NULL);
 }
@@ -374,11 +384,13 @@ void hruby_sim_start_timed_behaviors() {
     pthread_mutex_lock(&hruby_sim_mutex);
     /* Sets the end flags to 0. */
     sim_end_flag = 0;
+    /* Tells the behavior can run. */
+    behaviors_can_run = 1;
     /* Create and start the threads. */
     for(i=0; i<num_timed_behaviors; ++i) {
         num_run_behaviors += 1;
         // ++num_active_behaviors;
-        // printf("0 num_active_behaviors = %d\n",num_active_behaviors);
+        // printf("0 num_run_behaviors = %d\n",num_run_behaviors);
         pthread_create(&timed_behaviors[i]->thread,NULL,
                        &behavior_run,timed_behaviors[i]);
     }
@@ -457,7 +469,6 @@ void hruby_sim_core(char* name, void (*init_vizualizer)(char*),
  *  @param delay the delay to wait in fs.
  *  @param behavior the current behavior. */
 void hw_wait(unsigned long long delay, Behavior behavior) {
-    // printf("!1\n");
     /* Maybe the thread is to end immediatly. */
     if (sim_end_flag)
         pthread_exit(NULL);
@@ -465,16 +476,20 @@ void hw_wait(unsigned long long delay, Behavior behavior) {
     pthread_mutex_lock(&hruby_sim_mutex);
     /* Indicate the behavior finished current execution. */
     num_active_behaviors -= 1;
-    pthread_cond_signal(&hruby_sim_cond);
+    // printf("!!num_active_behaviors=%d\n",num_active_behaviors);
+    // pthread_cond_signal(&hruby_sim_cond);
     /* Update the behavior's time. */
     behavior->active_time += delay;
     pthread_mutex_unlock(&hruby_sim_mutex);
+    pthread_cond_signal(&hruby_sim_cond);
     /* Wait for being reactivated. */
     while(behavior->active_time > hruby_sim_time) {
         pthread_mutex_lock(&hruby_sim_mutex);
         while(!behaviors_can_run) {
+            // printf("!1\n");
             // pthread_cond_wait(&compute_cond, &hruby_sim_mutex);
             pthread_cond_wait(&hruby_beh_cond, &hruby_sim_mutex);
+            // printf("!2\n");
         }
         pthread_mutex_unlock(&hruby_sim_mutex);
     }

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.6.2"
+  VERSION = "2.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.3
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 2021-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler