Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
blender-vr-interactive
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
blender
blender-vr-interactive
Commits
35d36e62
Commit
35d36e62
authored
5 years ago
by
Martin Pulec
Browse files
Options
Downloads
Patches
Plain Diff
SHM: Fixed locking
parent
ba23ee2c
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cesnet/cesnet.cpp
+18
-12
18 additions, 12 deletions
cesnet/cesnet.cpp
with
18 additions
and
12 deletions
cesnet/cesnet.cpp
+
18
−
12
View file @
35d36e62
...
...
@@ -12,7 +12,7 @@
#include
<sys/shm.h>
#endif
#define REQUIRED_SHM_VERSION
5
#define REQUIRED_SHM_VERSION
6
#define SEM_KEY 5004
#define SHM_KEY 5004
...
...
@@ -180,8 +180,8 @@ void cesnet_set_render_buffer_yuv_i420(unsigned char *y, unsigned char *u, unsig
perror
(
"shmat"
);
return
;
}
///
2
semaphores: [ready_to_consume_frame, freame_ready]
int
sem
=
semget
(
SEM_KEY
,
2
,
0
);
///
3
semaphores: [ready_to_consume_frame, freame_ready
, lock
]
int
sem
=
semget
(
SEM_KEY
,
3
,
0
);
if
(
sem
==
-
1
)
{
perror
(
"semget"
);
return
;
...
...
@@ -191,11 +191,14 @@ void cesnet_set_render_buffer_yuv_i420(unsigned char *y, unsigned char *u, unsig
return
;
}
struct
sembuf
op
;
op
.
sem_num
=
0
;
// wait until UltraGrid is able to take a frame
op
.
sem_op
=
-
1
;
// decrement by one
op
.
sem_flg
=
0
;
if
(
semop
(
sem
,
&
op
,
1
)
==
-
1
)
{
struct
sembuf
op
[
2
];
op
[
0
].
sem_num
=
0
;
// wait until UltraGrid is able to take a frame
op
[
0
].
sem_op
=
-
1
;
// decrement by one
op
[
0
].
sem_flg
=
0
;
op
[
1
].
sem_num
=
2
;
// lock
op
[
1
].
sem_op
=
-
1
;
op
[
1
].
sem_flg
=
0
;
if
(
semop
(
sem
,
op
,
2
)
==
-
1
)
{
perror
(
"semop"
);
return
;
}
...
...
@@ -236,10 +239,13 @@ void cesnet_set_render_buffer_yuv_i420(unsigned char *y, unsigned char *u, unsig
convert_render_pkt_to_view_matrix
(
&
cesnet_shm
->
pkt
,
g_view_matrix
);
}
op
.
sem_num
=
1
;
op
.
sem_op
=
1
;
// and post that we have a new frame
op
.
sem_flg
=
0
;
if
(
semop
(
sem
,
&
op
,
1
)
==
-
1
)
{
op
[
0
].
sem_num
=
1
;
op
[
0
].
sem_op
=
1
;
// and post that we have a new frame
op
[
0
].
sem_flg
=
0
;
op
[
1
].
sem_num
=
2
;
op
[
1
].
sem_op
=
1
;
// unlock
op
[
1
].
sem_flg
=
0
;
if
(
semop
(
sem
,
op
,
2
)
==
-
1
)
{
perror
(
"semop"
);
}
shmdt
(
cesnet_shm
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment