commit f76bbf5384c0504b165168f51ccadfb605ccb2af
author Tom Cherry <tomcherry@google.com> Wed Nov 08 14:01:00 2017 -0800
committer Tom Cherry <tomcherry@google.com> Tue Nov 14 08:55:27 2017 -0800
tree c064deacfbff5a8d7de99d8a37ff86d66e4c0101
parent fd44b9f8d89ce4f33ff39d7f340a5ed08029d21c

Remove some globals from system_properties

pa_size should be static to prop_area, so make it so.

__system_property_area__ was reused for various purposes, but
realistically is a deprecated symbol and this finally separates us
from it.

Bug: 36001741
Test: boot bullhead, system property unit tests
Change-Id: I39663cc3b613093fa4c728b21d8ba58754f8e105

libc/system_properties/contexts_split.cpp

diff --git a/libc/system_properties/contexts_split.cpp b/libc/system_properties/contexts_split.cpp
index 964a1e4..77f2069 100644
--- a/libc/system_properties/contexts_split.cpp
+++ b/libc/system_properties/contexts_split.cpp
@@ -31,13 +31,12 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/mman.h>
 #include <sys/stat.h>
 
 #include <async_safe/log.h>
 
 #include "context_node.h"
-#include "system_property_globals.h"
+#include "property_filename.h"
 
 class ContextListNode : public ContextNode {
  public:
@@ -193,22 +192,22 @@
   return items;
 }
 
-static bool MapSystemPropertyArea(bool access_rw, bool* fsetxattr_failed) {
+bool ContextsSplit::MapSerialPropertyArea(bool access_rw, bool* fsetxattr_failed) {
   char filename[PROP_FILENAME_MAX];
   int len = async_safe_format_buffer(filename, sizeof(filename), "%s/properties_serial",
                                      property_filename);
   if (len < 0 || len > PROP_FILENAME_MAX) {
-    __system_property_area__ = nullptr;
+    serial_prop_area_ = nullptr;
     return false;
   }
 
   if (access_rw) {
-    __system_property_area__ =
+    serial_prop_area_ =
         prop_area::map_prop_area_rw(filename, "u:object_r:properties_serial:s0", fsetxattr_failed);
   } else {
-    __system_property_area__ = prop_area::map_prop_area(filename);
+    serial_prop_area_ = prop_area::map_prop_area(filename);
   }
-  return __system_property_area__;
+  return serial_prop_area_;
 }
 
 bool ContextsSplit::InitializePropertiesFromFile(const char* filename) {
@@ -300,14 +299,14 @@
         open_failed = true;
       }
     });
-    if (open_failed || !MapSystemPropertyArea(true, &fsetxattr_failed)) {
+    if (open_failed || !MapSerialPropertyArea(true, &fsetxattr_failed)) {
       FreeAndUnmap();
       return false;
     }
 
     return !fsetxattr_failed;
   } else {
-    if (!MapSystemPropertyArea(false, nullptr)) {
+    if (!MapSerialPropertyArea(false, nullptr)) {
       FreeAndUnmap();
       return false;
     }
@@ -348,8 +347,5 @@
 void ContextsSplit::FreeAndUnmap() {
   ListFree(&prefixes_);
   ListFree(&contexts_);
-  if (__system_property_area__) {
-    munmap(__system_property_area__, pa_size);
-    __system_property_area__ = nullptr;
-  }
+  prop_area::unmap_prop_area(&serial_prop_area_);
 }