Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
aom-rav1e
Commits
8a7cc1f4
Commit
8a7cc1f4
authored
Jul 10, 2014
by
James Zern
Committed by
Gerrit Code Review
Jul 10, 2014
Browse files
Options
Browse Files
Download
Plain Diff
Merge "update vp9_thread.c"
parents
c00e9c47
8701ed02
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
51 additions
and
18 deletions
+51
-18
test/vp9_thread_test.cc
test/vp9_thread_test.cc
+44
-12
vp9/common/vp9_thread.c
vp9/common/vp9_thread.c
+7
-6
No files found.
test/vp9_thread_test.cc
View file @
8a7cc1f4
...
...
@@ -35,6 +35,15 @@ class VP9WorkerThreadTest : public ::testing::TestWithParam<bool> {
vp9_get_worker_interface
()
->
end
(
&
worker_
);
}
void
Run
(
VP9Worker
*
worker
)
{
const
bool
synchronous
=
GetParam
();
if
(
synchronous
)
{
vp9_get_worker_interface
()
->
execute
(
worker
);
}
else
{
vp9_get_worker_interface
()
->
launch
(
worker
);
}
}
VP9Worker
worker_
;
};
...
...
@@ -57,12 +66,7 @@ TEST_P(VP9WorkerThreadTest, HookSuccess) {
worker_
.
data1
=
&
hook_data
;
worker_
.
data2
=
&
return_value
;
const
bool
synchronous
=
GetParam
();
if
(
synchronous
)
{
vp9_get_worker_interface
()
->
execute
(
&
worker_
);
}
else
{
vp9_get_worker_interface
()
->
launch
(
&
worker_
);
}
Run
(
&
worker_
);
EXPECT_NE
(
vp9_get_worker_interface
()
->
sync
(
&
worker_
),
0
);
EXPECT_FALSE
(
worker_
.
had_error
);
EXPECT_EQ
(
5
,
hook_data
);
...
...
@@ -81,12 +85,7 @@ TEST_P(VP9WorkerThreadTest, HookFailure) {
worker_
.
data1
=
&
hook_data
;
worker_
.
data2
=
&
return_value
;
const
bool
synchronous
=
GetParam
();
if
(
synchronous
)
{
vp9_get_worker_interface
()
->
execute
(
&
worker_
);
}
else
{
vp9_get_worker_interface
()
->
launch
(
&
worker_
);
}
Run
(
&
worker_
);
EXPECT_FALSE
(
vp9_get_worker_interface
()
->
sync
(
&
worker_
));
EXPECT_EQ
(
1
,
worker_
.
had_error
);
...
...
@@ -99,6 +98,39 @@ TEST_P(VP9WorkerThreadTest, HookFailure) {
EXPECT_FALSE
(
worker_
.
had_error
);
}
TEST_P
(
VP9WorkerThreadTest
,
EndWithoutSync
)
{
// Create a large number of threads to increase the chances of detecting a
// race. Doing more work in the hook is no guarantee as any race would occur
// post hook execution in the main thread loop driver.
static
const
int
kNumWorkers
=
64
;
VP9Worker
workers
[
kNumWorkers
];
int
hook_data
[
kNumWorkers
];
int
return_value
[
kNumWorkers
];
for
(
int
n
=
0
;
n
<
kNumWorkers
;
++
n
)
{
vp9_get_worker_interface
()
->
init
(
&
workers
[
n
]);
return_value
[
n
]
=
1
;
// return successfully from the hook
workers
[
n
].
hook
=
ThreadHook
;
workers
[
n
].
data1
=
&
hook_data
[
n
];
workers
[
n
].
data2
=
&
return_value
[
n
];
}
for
(
int
i
=
0
;
i
<
2
;
++
i
)
{
for
(
int
n
=
0
;
n
<
kNumWorkers
;
++
n
)
{
EXPECT_NE
(
vp9_get_worker_interface
()
->
reset
(
&
workers
[
n
]),
0
);
hook_data
[
n
]
=
0
;
}
for
(
int
n
=
0
;
n
<
kNumWorkers
;
++
n
)
{
Run
(
&
workers
[
n
]);
}
for
(
int
n
=
kNumWorkers
-
1
;
n
>=
0
;
--
n
)
{
vp9_get_worker_interface
()
->
end
(
&
workers
[
n
]);
}
}
}
TEST
(
VP9WorkerThreadTest
,
TestInterfaceAPI
)
{
EXPECT_EQ
(
0
,
vp9_set_worker_interface
(
NULL
));
EXPECT_TRUE
(
vp9_get_worker_interface
()
!=
NULL
);
...
...
vp9/common/vp9_thread.c
View file @
8a7cc1f4
...
...
@@ -11,7 +11,7 @@
//
// Original source:
// http://git.chromium.org/webm/libwebp.git
// 100644 blob
08ad4e1fecba302bf1247645e84a7d2779956bc3
src/utils/thread.c
// 100644 blob
264210ba2807e4da47eb5d18c04cf869d89b9784
src/utils/thread.c
#include <assert.h>
#include <string.h> // for memset()
...
...
@@ -144,18 +144,19 @@ static void launch(VP9Worker *const worker) {
}
static
void
end
(
VP9Worker
*
const
worker
)
{
if
(
worker
->
status_
>=
OK
)
{
#if CONFIG_MULTITHREAD
if
(
worker
->
impl_
!=
NULL
)
{
change_state
(
worker
,
NOT_OK
);
pthread_join
(
worker
->
impl_
->
thread_
,
NULL
);
pthread_mutex_destroy
(
&
worker
->
impl_
->
mutex_
);
pthread_cond_destroy
(
&
worker
->
impl_
->
condition_
);
vpx_free
(
worker
->
impl_
);
worker
->
impl_
=
NULL
;
}
#else
worker
->
status_
=
NOT_OK
;
worker
->
status_
=
NOT_OK
;
assert
(
worker
->
impl_
==
NULL
);
#endif
}
vpx_free
(
worker
->
impl_
);
worker
->
impl_
=
NULL
;
assert
(
worker
->
status_
==
NOT_OK
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment