diff options
| author | Dimitri Staessens <[email protected]> | 2018-10-06 18:06:47 +0200 |
|---|---|---|
| committer | Dimitri Staessens <[email protected]> | 2018-10-06 18:06:47 +0200 |
| commit | 0b2e5c5410580c755cef02114e51f15b19cfaffa (patch) | |
| tree | 63d684e6057c9caa43739b599d54a72f9959d4f8 /src/irmd/irm_flow.c | |
| parent | bfc29ca20406ccd69363b0f9796987534318e7ae (diff) | |
| parent | d9ad3852613cda026d4520b5c608ada7433dd7d9 (diff) | |
| download | ouroboros-0b2e5c5410580c755cef02114e51f15b19cfaffa.tar.gz ouroboros-0b2e5c5410580c755cef02114e51f15b19cfaffa.zip | |
Merge branch 'testing' into be
Diffstat (limited to 'src/irmd/irm_flow.c')
| -rw-r--r-- | src/irmd/irm_flow.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/irmd/irm_flow.c b/src/irmd/irm_flow.c index dfbe5e95..a0889f09 100644 --- a/src/irmd/irm_flow.c +++ b/src/irmd/irm_flow.c @@ -38,8 +38,8 @@ struct irm_flow * irm_flow_create(pid_t n_pid, pid_t n_1_pid, - int port_id, - qoscube_t qc) + int flow_id, + qosspec_t qs) { pthread_condattr_t cattr; struct irm_flow * f = malloc(sizeof(*f)); @@ -60,16 +60,16 @@ struct irm_flow * irm_flow_create(pid_t n_pid, f->n_pid = n_pid; f->n_1_pid = n_1_pid; - f->port_id = port_id; - f->qc = qc; + f->flow_id = flow_id; + f->qs = qs; - f->n_rb = shm_rbuff_create(n_pid, port_id); + f->n_rb = shm_rbuff_create(n_pid, flow_id); if (f->n_rb == NULL) { log_err("Could not create ringbuffer for process %d.", n_pid); goto fail_n_rbuff; } - f->n_1_rb = shm_rbuff_create(n_1_pid, port_id); + f->n_1_rb = shm_rbuff_create(n_1_pid, flow_id); if (f->n_1_rb == NULL) { log_err("Could not create ringbuffer for process %d.", n_1_pid); goto fail_n_1_rbuff; |