提交: c472b6a362f3a2dfc3d65a035ff1bc59951a9ef2 - system-coremmmm (git)

system/corennnnn

Commit MetaInfo

• 修订版: c472b6a362f3a2dfc3d65a035ff1bc59951a9ef2 (tree)
• 时间: 2016-11-09 00:27:22
• 作者: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Merge branch 'android-ia' into nougat-x86

更改概述

• modified: adb/transport_local.cpp
• modified: include/diskconfig/diskconfig.h
• modified: init/devices.cpp
• modified: libdiskconfig/Android.mk
• modified: libdiskconfig/config_mbr.c
• modified: libdiskconfig/diskconfig.c
• modified: libdiskconfig/diskutils.c
• modified: toolbox/newfs_msdos.c

差异

--- a/adb/transport_local.cpp
+++ b/adb/transport_local.cpp
@@ -51,7 +51,48 @@ ADB_MUTEX_DEFINE(local_transports_lock);
  * trying to connect twice to a given local transport.
  */
 static atransport*  local_transports[ ADB_LOCAL_TRANSPORT_MAX ];
-#endif /* ADB_HOST */
+#else /* !ADB_HOST */
+
+#define WAKE_LOCK_NAME      "adb-socket-connection"
+#define WAKE_LOCK_ACQUIRE   "/sys/power/wake_lock"
+#define WAKE_LOCK_RELEASE   "/sys/power/wake_unlock"
+
+static int sysfs_write(const char *node, const char *message)
+{
+    int fd;
+    ssize_t to_write;
+    int ret = 0;
+
+    fd = adb_open(node, O_RDWR);
+    if (!fd) {
+        D("open '%s' failed: %s", node, strerror(errno));
+        return -1;
+    }
+
+    to_write = strlen(message);
+    if (adb_write(fd, message, to_write) != to_write) {
+        D("write '%s' failed: %s", node, strerror(errno));
+        ret = -1;
+    }
+    adb_close(fd);
+    return ret;
+}
+
+static void get_wakelock(void)
+{
+    if (sysfs_write(WAKE_LOCK_ACQUIRE, WAKE_LOCK_NAME)) {
+        D("couldn't reserve wakelock for socket connection");
+    }
+}
+
+static void release_wakelock(void)
+{
+    if (sysfs_write(WAKE_LOCK_RELEASE, WAKE_LOCK_NAME)) {
+        D("couldn't release wakelock for socket connection");
+    }
+}
+
+#endif /* !ADB_HOST */
 
 static int remote_read(apacket *p, atransport *t)
 {
@@ -170,6 +211,9 @@ static void server_socket_thread(void* arg) {
         fd = adb_socket_accept(serverfd, addrp, &alen);
         if(fd >= 0) {
             D("server: new connection on fd %d", fd);
+#if !ADB_HOST
+            get_wakelock();
+#endif
             close_on_exec(fd);
             disable_tcp_nagle(fd);
             register_socket_transport(fd, "host", port, 1);
@@ -339,6 +383,9 @@ static void remote_kick(atransport *t)
 
 static void remote_close(atransport *t)
 {
+#if !ADB_HOST
+    release_wakelock();
+#endif
     int fd = t->sfd;
     if (fd != -1) {
         t->sfd = -1;

--- a/include/diskconfig/diskconfig.h
+++ b/include/diskconfig/diskconfig.h
@@ -21,6 +21,11 @@
 #include <stdint.h>
 #include <sys/types.h>
 
+#ifdef __APPLE__
+typedef int64_t loff_t;
+#define lseek64 lseek
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif

--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -981,8 +981,8 @@ void device_init() {
     sehandle = selinux_android_file_context_handle();
     selinux_status_open(true);
 
-    /* is 256K enough? udev uses 16MB! */
-    device_fd = uevent_open_socket(256*1024, true);
+    /* is 8MB enough? udev uses 16MB! */
+    device_fd = uevent_open_socket(8 * 1024 * 1024, true);
     if (device_fd == -1) {
         return;
     }

--- a/libdiskconfig/Android.mk
+++ b/libdiskconfig/Android.mk
@@ -15,11 +15,9 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils liblog libc
 LOCAL_CFLAGS := -Werror
 include $(BUILD_SHARED_LIBRARY)
 
-ifeq ($(HOST_OS),linux)
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(commonSources)
 LOCAL_MODULE := libdiskconfig_host
 LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE
+LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE -DHOST_BUILD
 include $(BUILD_HOST_STATIC_LIBRARY)
-endif # HOST_OS == linux

--- a/libdiskconfig/config_mbr.c
+++ b/libdiskconfig/config_mbr.c
@@ -260,11 +260,11 @@ config_mbr(struct disk_info *dinfo)
         }
 
         /* if extended, need 1 lba for ebr */
-        if ((cur_lba + extended) >= dinfo->num_lba)
+        if (dinfo->num_lba && (cur_lba + extended) >= dinfo->num_lba)
             goto nospace;
         else if (pinfo->len_kb != (uint32_t)-1) {
             uint32_t sz_lba = (pinfo->len_kb / dinfo->sect_size) * 1024;
-            if ((cur_lba + sz_lba + extended) > dinfo->num_lba)
+            if (dinfo->num_lba && (cur_lba + sz_lba + extended) > dinfo->num_lba)
                 goto nospace;
         }
 

--- a/libdiskconfig/diskconfig.c
+++ b/libdiskconfig/diskconfig.c
@@ -27,7 +27,9 @@
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 
+#ifndef HOST_BUILD
 #include <linux/fs.h>
+#endif
 
 #include <cutils/config_utils.h>
 #include <log/log.h>
@@ -76,7 +78,7 @@ parse_len(const char *str, uint64_t *plen)
         }
     } else {
         /* convert len to kilobytes */
-        if (multiple > 1024)
+        if (multiple >= 1024)
             multiple >>= 10;
         *plen *= multiple;
 
@@ -236,6 +238,7 @@ fail:
     return NULL;
 }
 
+#ifndef HOST_BUILD
 static int
 sync_ptable(int fd)
 {
@@ -256,6 +259,13 @@ sync_ptable(int fd)
 
     return 0;
 }
+#else
+static int sync_ptable(int fd)
+{
+    (void)fd;
+    return 0;
+}
+#endif
 
 /* This function verifies that the disk info provided is valid, and if so,
  * returns an open file descriptor.
@@ -272,7 +282,6 @@ static int
 validate(struct disk_info *dinfo)
 {
     int fd;
-    int sect_sz;
     uint64_t disk_size;
     uint64_t total_size;
     int cnt;
@@ -298,6 +307,12 @@ validate(struct disk_info *dinfo)
     /* Verify that we can operate on the device that was requested.
      * We presently only support block devices and regular file images. */
     if (S_ISBLK(stat.st_mode)) {
+#ifdef HOST_BUILD
+        ALOGE("Block device manipulation on host forbidden");
+        goto fail;
+#else
+        int sect_sz;
+
         /* get the sector size and make sure we agree */
         if (ioctl(fd, BLKSSZGET, &sect_sz) < 0) {
             ALOGE("Cannot get sector size (errno=%d)", errno);
@@ -319,6 +334,7 @@ validate(struct disk_info *dinfo)
             dinfo->num_lba = (uint32_t)(disk_size / (uint64_t)dinfo->sect_size);
         } else
             disk_size = (uint64_t)dinfo->num_lba * (uint64_t)dinfo->sect_size;
+#endif
     } else if (S_ISREG(stat.st_mode)) {
         ALOGI("Requesting operation on a regular file, not block device.");
         if (!dinfo->sect_size) {

--- a/libdiskconfig/diskutils.c
+++ b/libdiskconfig/diskutils.c
@@ -36,6 +36,7 @@ write_raw_image(const char *dst, const char *src, loff_t offset, int test)
     int dst_fd = -1;
     int src_fd = -1;
     uint8_t buffer[2048];
+    ssize_t buf_offset;
     ssize_t nr_bytes;
     ssize_t tmp;
     int done = 0;
@@ -80,8 +81,9 @@ write_raw_image(const char *dst, const char *src, loff_t offset, int test)
         if (test)
             nr_bytes = 0;
 
+        buf_offset = 0;
         while (nr_bytes > 0) {
-            if ((tmp = write(dst_fd, buffer, nr_bytes)) < 0) {
+            if ((tmp = write(dst_fd, &buffer[buf_offset], nr_bytes)) < 0) {
                 /* XXX: Should we not even bother with EINTR? */
                 if (errno == EINTR)
                     continue;
@@ -91,6 +93,7 @@ write_raw_image(const char *dst, const char *src, loff_t offset, int test)
             if (!tmp)
                 continue;
             nr_bytes -= tmp;
+            buf_offset += tmp;
         }
     }
 

--- a/toolbox/newfs_msdos.c
+++ b/toolbox/newfs_msdos.c
@@ -249,7 +249,7 @@ int newfs_msdos_main(int argc, char *argv[])
     char buf[MAXPATHLEN];
     struct stat sb;
     struct timeval tv;
-    struct bpb bpb;
+    struct bpb bpb, tempbpb;
     struct tm *tm;
     struct bs *bs;
     struct bsbpb *bsbpb;
@@ -553,6 +553,7 @@ int newfs_msdos_main(int argc, char *argv[])
     set_spf = !bpb.bspf;
     set_spc = !bpb.spc;
     tempx = x;
+    memset(&tempbpb, 0, sizeof(bpb));
     /*
      * Attempt to align if opt_A is set. This is done by increasing the number
      * of reserved blocks. This can cause other factors to change, which can in
@@ -600,10 +601,14 @@ int newfs_msdos_main(int argc, char *argv[])
             alignment = (bpb.res + bpb.bspf * bpb.nft) % bpb.spc;
             extra_res += bpb.spc - alignment;
         }
-        attempts++;
+        if (++attempts == 1)
+            memcpy(&tempbpb, &bpb, sizeof(bpb));
     } while(opt_A && alignment != 0 && attempts < 2);
-    if (alignment != 0)
+    if (alignment != 0) {
         warnx("warning: Alignment failed.");
+        /* return to data from first iteration */
+        memcpy(&bpb, &tempbpb, sizeof(bpb));
+    }
 
     cls = (bpb.bsec - x1) / bpb.spc;
     x = (u_int64_t)bpb.bspf * bpb.bps * NPB / (fat / BPN) - RESFTE;