commit 5ab6677f9f58fb46a9a4eec8bd5338edd5cd57be
author Dmitry Shmidt <dimitrysh@google.com> Thu Oct 01 21:42:50 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 01 21:42:50 2015 +0000
tree 16ea34f3d3abdbd25444deca9aa7f80bc7d6fe56
parent 3cdfbc69c698ed75cf24da9016e104eecfc3ac46
parent 0f43f1a83712d80641f9df13043744475170265a

Merge "libnetutils: Add synchronization per socket full operation"

adb/fdevent.cpp

diff --git a/adb/fdevent.cpp b/adb/fdevent.cpp
index 2ffd908..1ccee9b 100644
--- a/adb/fdevent.cpp
+++ b/adb/fdevent.cpp
@@ -174,17 +174,16 @@
     if ((fde->state & FDE_EVENTMASK) == events) {
         return;
     }
-    if (fde->state & FDE_ACTIVE) {
-        fdevent_update(fde, events);
-        D("fdevent_set: %s, events = %u", dump_fde(fde).c_str(), events);
+    CHECK(fde->state & FDE_ACTIVE);
+    fdevent_update(fde, events);
+    D("fdevent_set: %s, events = %u", dump_fde(fde).c_str(), events);
 
-        if (fde->state & FDE_PENDING) {
-            // If we are pending, make sure we don't signal an event that is no longer wanted.
-            fde->events &= ~events;
-            if (fde->events == 0) {
-                g_pending_list.remove(fde);
-                fde->state &= ~FDE_PENDING;
-            }
+    if (fde->state & FDE_PENDING) {
+        // If we are pending, make sure we don't signal an event that is no longer wanted.
+        fde->events &= events;
+        if (fde->events == 0) {
+            g_pending_list.remove(fde);
+            fde->state &= ~FDE_PENDING;
         }
     }
 }
@@ -262,7 +261,7 @@
 {
     unsigned events = fde->events;
     fde->events = 0;
-    if(!(fde->state & FDE_PENDING)) return;
+    CHECK(fde->state & FDE_PENDING);
     fde->state &= (~FDE_PENDING);
     D("fdevent_call_fdfunc %s", dump_fde(fde).c_str());
     fde->func(fde->fd, events, fde->arg);

metricsd/metrics_daemon.rc

diff --git a/metricsd/metrics_daemon.rc b/metricsd/metrics_daemon.rc
index 73ce673..0e1fcd5 100644
--- a/metricsd/metrics_daemon.rc
+++ b/metricsd/metrics_daemon.rc
@@ -5,4 +5,3 @@
     class late_start
     user system
     group system dbus inet
-    seclabel u:r:brillo:s0