Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Casanowow Life for love
VLC-Android
Commits
5c5d1168
Commit
5c5d1168
authored
Jun 27, 2012
by
Rafaël Carré
Browse files
Revert "Add pthread_once function from AOSP"
This reverts commit
1ed73496
.
parent
1ed73496
Changes
2
Hide whitespace changes
Inline
Side-by-side
vlc-android/jni/Android.mk
View file @
5c5d1168
...
...
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE
:=
libvlcjni
LOCAL_SRC_FILES
:=
libvlcjni.c aout.c thumbnailer.c pthread-condattr.c pthread-rwlocks.c
pthread-once.c
eventfd.c sem.c
LOCAL_SRC_FILES
:=
libvlcjni.c aout.c thumbnailer.c pthread-condattr.c pthread-rwlocks.c eventfd.c sem.c
LOCAL_C_INCLUDES
:=
$(VLC_SRC_DIR)
/include
...
...
vlc-android/jni/pthread-once.c
deleted
100644 → 0
View file @
1ed73496
/*
* Copyright (C) 2008 The Android Open Source Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include
<errno.h>
#include
<pthread.h>
#include
<unistd.h>
/* from bionic_atomic_inline.h */
# define ANDROID_MEMBAR_FULL() \
do { __asm__ __volatile__ ("" ::: "memory"); } while (0)
/* NOTE: this implementation doesn't support a init function that throws a C++ exception
* or calls fork()
*/
int
pthread_once
(
pthread_once_t
*
once_control
,
void
(
*
init_routine
)(
void
)
)
{
if
(
once_control
==
NULL
||
init_routine
==
NULL
)
return
EINVAL
;
static
pthread_mutex_t
once_lock
=
PTHREAD_RECURSIVE_MUTEX_INITIALIZER
;
volatile
pthread_once_t
*
ocptr
=
once_control
;
pthread_once_t
tmp
=
*
ocptr
;
ANDROID_MEMBAR_FULL
();
if
(
tmp
==
PTHREAD_ONCE_INIT
)
{
pthread_mutex_lock
(
&
once_lock
);
if
(
*
ocptr
==
PTHREAD_ONCE_INIT
)
{
(
*
init_routine
)();
ANDROID_MEMBAR_FULL
();
*
ocptr
=
~
PTHREAD_ONCE_INIT
;
}
pthread_mutex_unlock
(
&
once_lock
);
}
return
0
;
}
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment