examples/*: fix handling of zctx_interrupted

The previous behavior still continued in the loop but didn't executed anything. Now, if zctx_interrupted becomes active the current loop exits appropriately

examples/*: fix handling of zctx_interrupted
The previous behavior still continued in the loop but didn't executed anything. Now, if zctx_interrupted becomes active the current loop exits appropriately
30ed5da6 · Lucas Russo · 5a5f5831 · 30ed5da6 · 30ed5da6 · 30ed5da6
Commit 30ed5da6 authored Jun 26, 2014 by Lucas Russo
Hide whitespace changes
Inline Side-by-side

Showing with 46 additions and 16 deletions

acq.c examples/acq.c +16 -12

dsp_swap.c examples/dsp_swap.c +24 -0

leds.c examples/leds.c +6 -4

No files found.
--- a/examples/acq.c
+++ b/examples/acq.c
@@ -32,25 +32,29 @@ void print_data (uint32_t chan, uint32_t *data, uint32_t size)
    if (chan == 0) {
        int16_t *raw_data16 = (int16_t *) data;
        for (uint32_t i = 0; i < (size/sizeof(uint16_t)) / 4; i++) {
-            if (!zctx_interrupted) {
-                printf ("%6u\t %8d\t %8d\t %8d\t %8d\n", i,
-                        raw_data16[(i*4)],
-                        raw_data16[(i*4)+1],
-                        raw_data16[(i*4)+2],
-                        raw_data16[(i*4)+3]);
+            if (zctx_interrupted) {
+                break;
            }
+
+            printf ("%6u\t %8d\t %8d\t %8d\t %8d\n", i,
+                    raw_data16[(i*4)],
+                    raw_data16[(i*4)+1],
+                    raw_data16[(i*4)+2],
+                    raw_data16[(i*4)+3]);
        }
    }
    else {
        int32_t *raw_data32 = (int32_t *) data;
        for (uint32_t i = 0; i < (size/sizeof(uint32_t)) / 4; i++) {
-            if (!zctx_interrupted) {
-                printf ("%6u\t %8d\t %8d\t %8d\t %8d\n", i,
-                        raw_data32[(i*4)],
-                        raw_data32[(i*4)+1],
-                        raw_data32[(i*4)+2],
-                        raw_data32[(i*4)+3]);
+            if (zctx_interrupted) {
+                break;
            }
+
+            printf ("%6u\t %8d\t %8d\t %8d\t %8d\n", i,
+                    raw_data32[(i*4)],
+                    raw_data32[(i*4)+1],
+                    raw_data32[(i*4)+2],
+                    raw_data32[(i*4)+3]);
        }
    }
 }

--- a/examples/dsp_swap.c
+++ b/examples/dsp_swap.c
@@ -162,6 +162,30 @@ int main (int argc, char *argv [])
    fprintf (stdout, "[client:swap]: bpm_set_gain_a = direct %u, inverted %u was successfully executed\n",
            gain_aa, gain_ac);

+    err = bpm_set_gain_b (bpm_client, "BPM0:DEVIO:SWAP", gain_aa, gain_ac);
+    if (err != BPM_CLIENT_SUCCESS){
+        fprintf (stderr, "[client:swap]: bpm_set_gain_a failed\n");
+        goto err_bpm_set;
+    }
+    fprintf (stdout, "[client:swap]: bpm_set_gain_a = direct %u, inverted %u was successfully executed\n",
+            gain_aa, gain_ac);
+
+    err = bpm_set_gain_c (bpm_client, "BPM0:DEVIO:SWAP", gain_aa, gain_ac);
+    if (err != BPM_CLIENT_SUCCESS){
+        fprintf (stderr, "[client:swap]: bpm_set_gain_a failed\n");
+        goto err_bpm_set;
+    }
+    fprintf (stdout, "[client:swap]: bpm_set_gain_a = direct %u, inverted %u was successfully executed\n",
+            gain_aa, gain_ac);
+
+    err = bpm_set_gain_d (bpm_client, "BPM0:DEVIO:SWAP", gain_aa, gain_ac);
+    if (err != BPM_CLIENT_SUCCESS){
+        fprintf (stderr, "[client:swap]: bpm_set_gain_a failed\n");
+        goto err_bpm_set;
+    }
+    fprintf (stdout, "[client:swap]: bpm_set_gain_a = direct %u, inverted %u was successfully executed\n",
+            gain_aa, gain_ac);
+
 err_bpm_get:
 err_bpm_set:
    str_p = &broker_endp;

--- a/examples/leds.c
+++ b/examples/leds.c
@@ -64,11 +64,13 @@ int main (int argc, char *argv [])
        uint32_t leds = (1 << 1);
        unsigned int j;
        for (j = 0; j < 3; ++j) {
-            if (!zctx_interrupted) {
-                bpm_blink_leds (bpm_client, "BPM0:DEVIO:FMC130M_4CH", leds);
-                usleep (80000);
-                leds <<= 1;
+            if (zctx_interrupted) {
+                break;
            }
+
+            bpm_blink_leds (bpm_client, "BPM0:DEVIO:FMC130M_4CH", leds);
+            usleep (80000);
+            leds <<= 1;
        }
    }