Skip to content

W
White Rabbit Switch - Software
Commit 5e6a25c3 authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

userspace/tools: add read locks from rtud's shmem 

Read locks needed to have consistent data reads.
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent 95a692f9
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 17 deletions
userspace/tools/wrs_vlans.c
View file @ 5e6a25c3
......@@ -605,26 +605,29 @@ static int rtu_find_vlan(struct rtu_vlan_table_entry *rtu_vlan_entry, int vid,
{
unsigned ii;
unsigned retries = 0;
/* copy data no mater if it will be used later, with the sequential
* lock to have all data consistent */
do {
ii = wrs_shm_seqbegin(rtu_port_shmem);
memcpy(rtu_vlan_entry, &vlan_tab_shm[vid],
sizeof(*rtu_vlan_entry));
retries++;
if (retries > 100) {
fprintf(stderr, "%s: couldn't read consistent "
"data from RTU's shmem. "
"Use inconsistent\n", prgname);
break; /* use inconsistent data */
}
usleep(1000);
} while (wrs_shm_seqretry(rtu_port_shmem, ii));
/* Ignore entires that are not active */
if ((vlan_tab_shm[vid].drop != 0)
&& (vlan_tab_shm[vid].port_mask == 0x0))
if ((rtu_vlan_entry->drop != 0)
&& (rtu_vlan_entry->port_mask == 0x0))
return 0;
if ((fid == vlan_tab_shm[vid].fid) || (fid == -1)) {
do {
ii = wrs_shm_seqbegin(rtu_port_shmem);
memcpy(rtu_vlan_entry, &vlan_tab_shm[vid],
sizeof(*rtu_vlan_entry));
retries++;
if (retries > 100) {
fprintf(stderr, "%s: couldn't read consistent "
"data from RTU's shmem. "
"Use inconsistent\n", prgname);
break; /* use inconsistent data */
}
usleep(1000);
} while (wrs_shm_seqretry(rtu_port_shmem, ii));
if ((fid == rtu_vlan_entry->fid) || (fid == -1))
return 1;
}
return 0;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment