generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolved conflicts for merge of e7329284 to master

Browse Source 
Change-Id: Iaeb09451ed1a268a025ce3033ab018f28f954848
This commit is contained in:
Sreeram Ramachandran 2014-05-19 09:57:54 -07:00
commit 7fe1063797
5 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libc/bionic/NetdClient.cpp
View File

@ -18,11 +18,11 @@
#error NetdClient.cpp should NOT be included in static libc builds.
#endif
#include <private/NetdClient.h>
#include <private/libc_logging.h>
#include <pthread.h>
#include "private/libc_logging.h"
#include "private/NetdClientDispatch.h"
#include <dlfcn.h>
#include <pthread.h>
template <typename FunctionType>
static void netdClientInitFunction(void* handle, const char* symbol, FunctionType* function) {

6
libc/bionic/NetdClientDispatch.cpp
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include <private/NetdClient.h>
#include "private/NetdClientDispatch.h"
#ifdef __i386__
#define __socketcall __attribute__((__cdecl__))
@ -29,7 +29,9 @@ static unsigned fallBackNetIdForResolv(unsigned netId) {
return netId;
}
NetdClientDispatch __netdClientDispatch __attribute__((aligned(32))) = {
// This structure is modified only at startup (when libc.so is loaded) and never
// afterwards, so it's okay that it's read later at runtime without a lock.
__LIBC_HIDDEN__ NetdClientDispatch __netdClientDispatch __attribute__((aligned(32))) = {
__accept,
__connect,
fallBackNetIdForResolv,

3
libc/bionic/accept.cpp
View File

@ -14,7 +14,8 @@
* limitations under the License.
*/
#include <private/NetdClient.h>
#include "private/NetdClientDispatch.h"
#include <sys/socket.h>
int accept(int sockfd, sockaddr* addr, socklen_t* addrlen) {

3
libc/bionic/connect.cpp
View File

@ -14,7 +14,8 @@
* limitations under the License.
*/
#include <private/NetdClient.h>
#include "private/NetdClientDispatch.h"
#include <sys/socket.h>
int connect(int sockfd, const sockaddr* addr, socklen_t addrlen) {

8
libc/private/NetdClient.h → libc/private/NetdClientDispatch.h
View File

@ -14,8 +14,8 @@
* limitations under the License.
*/
#ifndef PRIVATE_NETD_CLIENT_H
#define PRIVATE_NETD_CLIENT_H
#ifndef PRIVATE_NETD_CLIENT_DISPATCH_H
#define PRIVATE_NETD_CLIENT_DISPATCH_H
#include <sys/cdefs.h>
#include <sys/socket.h>
@ -28,8 +28,8 @@ struct NetdClientDispatch {
unsigned (*netIdForResolv)(unsigned);
};
extern struct NetdClientDispatch __netdClientDispatch;
extern __LIBC_HIDDEN__ struct NetdClientDispatch __netdClientDispatch;
__END_DECLS
#endif // PRIVATE_NETD_CLIENT_H
#endif // PRIVATE_NETD_CLIENT_DISPATCH_H