ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DO NOT MERGE: adb: use asocket's close function when closing.

Browse source 
close_all_sockets was assuming that all registered local sockets used
local_socket_close as their close function. However, this is not true
for JDWP sockets.

Backport of 53eb31d8 and 9b587de.

Bug: http://b/28347842
Change-Id: I13ec6fd87a0691c72608baf6038adcc0f03dca9f
This commit is contained in:
Josh Gao 2016-06-21 15:38:14 -07:00
parent 008efb756f
commit 5218ad36ad
3 changed files with 20 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adb/Android.mk
View file

@ -84,7 +84,9 @@ ifeq ($(USE_SYSDEPS_WIN32),)
LOCAL_STATIC_LIBRARIES += libcutils LOCAL_STATIC_LIBRARIES += libcutils
endif endif
include $(BUILD_HOST_EXECUTABLE) ifneq ($(HOST_OS),windows)
include $(BUILD_HOST_EXECUTABLE)
endif
$(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE)) $(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE))

1
adb/mutex_list.h
View file

@ -6,7 +6,6 @@
#ifndef ADB_MUTEX #ifndef ADB_MUTEX
#error ADB_MUTEX not defined when including this file #error ADB_MUTEX not defined when including this file
#endif #endif
ADB_MUTEX(socket_list_lock)
ADB_MUTEX(transport_lock) ADB_MUTEX(transport_lock)
#if ADB_HOST #if ADB_HOST
ADB_MUTEX(local_transports_lock) ADB_MUTEX(local_transports_lock)

40
adb/sockets.c
View file

@ -20,15 +20,18 @@
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <pthread.h>
#include "sysdeps.h" #include "sysdeps.h"
#define TRACE_TAG TRACE_SOCKETS #define TRACE_TAG TRACE_SOCKETS
#include "adb.h" #include "adb.h"
ADB_MUTEX_DEFINE( socket_list_lock ); #if defined(__BIONIC__)
#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP PTHREAD_RECURSIVE_MUTEX_INITIALIZER
#endif
static void local_socket_close_locked(asocket *s); static pthread_mutex_t socket_list_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
int sendfailmsg(int fd, const char *reason) int sendfailmsg(int fd, const char *reason)
{ {
@ -64,14 +67,14 @@ asocket *find_local_socket(unsigned id)
asocket *s; asocket *s;
asocket *result = NULL; asocket *result = NULL;
adb_mutex_lock(&socket_list_lock); pthread_mutex_lock(&socket_list_lock);
for (s = local_socket_list.next; s != &local_socket_list; s = s->next) { for (s = local_socket_list.next; s != &local_socket_list; s = s->next) {
if (s->id == id) { if (s->id == id) {
result = s; result = s;
break; break;
} }
} }
adb_mutex_unlock(&socket_list_lock); pthread_mutex_unlock(&socket_list_lock);
return result; return result;
} }
@ -88,12 +91,12 @@ insert_local_socket(asocket* s, asocket* list)
void install_local_socket(asocket *s) void install_local_socket(asocket *s)
{ {
adb_mutex_lock(&socket_list_lock); pthread_mutex_lock(&socket_list_lock);
s->id = local_socket_next_id++; s->id = local_socket_next_id++;
insert_local_socket(s, &local_socket_list); insert_local_socket(s, &local_socket_list);
adb_mutex_unlock(&socket_list_lock); pthread_mutex_unlock(&socket_list_lock);
} }
void remove_socket(asocket *s) void remove_socket(asocket *s)
@ -116,15 +119,15 @@ void close_all_sockets(atransport *t)
/* this is a little gross, but since s->close() *will* modify /* this is a little gross, but since s->close() *will* modify
** the list out from under you, your options are limited. ** the list out from under you, your options are limited.
*/ */
adb_mutex_lock(&socket_list_lock); pthread_mutex_lock(&socket_list_lock);
restart: restart:
for(s = local_socket_list.next; s != &local_socket_list; s = s->next){ for(s = local_socket_list.next; s != &local_socket_list; s = s->next){
if(s->transport == t || (s->peer && s->peer->transport == t)) { if(s->transport == t || (s->peer && s->peer->transport == t)) {
local_socket_close_locked(s); s->close(s);
goto restart; goto restart;
} }
} }
adb_mutex_unlock(&socket_list_lock); pthread_mutex_unlock(&socket_list_lock);
} }
static int local_socket_enqueue(asocket *s, apacket *p) static int local_socket_enqueue(asocket *s, apacket *p)
@ -188,13 +191,6 @@ static void local_socket_ready(asocket *s)
// D("LS(%d): ready()\n", s->id); // D("LS(%d): ready()\n", s->id);
} }
static void local_socket_close(asocket *s)
{
adb_mutex_lock(&socket_list_lock);
local_socket_close_locked(s);
adb_mutex_unlock(&socket_list_lock);
}
// be sure to hold the socket list lock when calling this // be sure to hold the socket list lock when calling this
static void local_socket_destroy(asocket *s) static void local_socket_destroy(asocket *s)
{ {
@ -224,19 +220,15 @@ static void local_socket_destroy(asocket *s)
} }
static void local_socket_close_locked(asocket *s) static void local_socket_close(asocket *s)
{ {
pthread_mutex_lock(&socket_list_lock);
D("entered. LS(%d) fd=%d\n", s->id, s->fd); D("entered. LS(%d) fd=%d\n", s->id, s->fd);
if(s->peer) { if(s->peer) {
D("LS(%d): closing peer. peer->id=%d peer->fd=%d\n", D("LS(%d): closing peer. peer->id=%d peer->fd=%d\n",
s->id, s->peer->id, s->peer->fd); s->id, s->peer->id, s->peer->fd);
s->peer->peer = 0; s->peer->peer = 0;
// tweak to avoid deadlock s->peer->close(s->peer);
if (s->peer->close == local_socket_close) {
local_socket_close_locked(s->peer);
} else {
s->peer->close(s->peer);
}
s->peer = 0; s->peer = 0;
} }
@ -247,6 +239,7 @@ static void local_socket_close_locked(asocket *s)
int id = s->id; int id = s->id;
local_socket_destroy(s); local_socket_destroy(s);
D("LS(%d): closed\n", id); D("LS(%d): closed\n", id);
pthread_mutex_unlock(&socket_list_lock);
return; return;
} }
@ -258,6 +251,7 @@ static void local_socket_close_locked(asocket *s)
remove_socket(s); remove_socket(s);
D("LS(%d): put on socket_closing_list fd=%d\n", s->id, s->fd); D("LS(%d): put on socket_closing_list fd=%d\n", s->id, s->fd);
insert_local_socket(s, &local_socket_closing_list); insert_local_socket(s, &local_socket_closing_list);
pthread_mutex_unlock(&socket_list_lock);
} }
static void local_socket_event_func(int fd, unsigned ev, void *_s) static void local_socket_event_func(int fd, unsigned ev, void *_s)