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

am 308c30af: Merge "Cosmetic changes to netd client files."

Browse Source 
* commit '308c30af72da7b13938934ba5037dd347b1ef139':
  Cosmetic changes to netd client files.
This commit is contained in:
Sreeram Ramachandran 2014-05-19 16:48:50 +00:00 committed by Android Git Automerger
commit 0617c73f91
5 changed files with 22 additions and 13 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. #error NetdClient.cpp should NOT be included in static libc builds.
#endif #endif
#include <private/NetdClient.h> #include "private/libc_logging.h"
#include <private/libc_logging.h> #include "private/NetdClientDispatch.h"
#include <pthread.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <pthread.h>
template <typename FunctionType> template <typename FunctionType>
static void netdClientInitFunction(void* handle, const char* symbol, FunctionType* function) { 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. * limitations under the License.
*/ */
#include <private/NetdClient.h> #include "private/NetdClientDispatch.h"
#ifdef __i386__ #ifdef __i386__
#define __socketcall __attribute__((__cdecl__)) #define __socketcall __attribute__((__cdecl__))
@ -25,7 +25,9 @@
extern "C" __socketcall int __accept(int, sockaddr*, socklen_t*); extern "C" __socketcall int __accept(int, sockaddr*, socklen_t*);
extern "C" __socketcall int __connect(int, const sockaddr*, socklen_t); extern "C" __socketcall int __connect(int, const sockaddr*, socklen_t);
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, __accept,
__connect, __connect,
}; };

3
libc/bionic/accept.cpp
View File

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

3
libc/bionic/connect.cpp
View File

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

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

@ -14,16 +14,21 @@
* limitations under the License. * limitations under the License.
*/ */
#ifndef PRIVATE_NETD_CLIENT_H #ifndef PRIVATE_NETD_CLIENT_DISPATCH_H
#define PRIVATE_NETD_CLIENT_H #define PRIVATE_NETD_CLIENT_DISPATCH_H
#include <sys/cdefs.h>
#include <sys/socket.h> #include <sys/socket.h>
__BEGIN_DECLS
struct NetdClientDispatch { struct NetdClientDispatch {
int (*accept)(int, sockaddr*, socklen_t*); int (*accept)(int, struct sockaddr*, socklen_t*);
int (*connect)(int, const sockaddr*, socklen_t); int (*connect)(int, const struct sockaddr*, socklen_t);
}; };
extern NetdClientDispatch __netdClientDispatch; extern __LIBC_HIDDEN__ struct NetdClientDispatch __netdClientDispatch;
#endif // PRIVATE_NETD_CLIENT_H __END_DECLS
#endif // PRIVATE_NETD_CLIENT_DISPATCH_H