commit 071288a0a3bbc3c4a6e161ea7474a5c06bd15ae0
author Stephen Hines <srhines@google.com> Thu Jan 27 14:38:26 2011 -0800
committer Stephen Hines <srhines@google.com> Thu Jan 27 15:05:46 2011 -0800
tree 87b6570b2060b8f76dbb7451cbbfb7c274ce2a5a
parent 937a0bc1c7396b1da63917b3dc5c5aa6d920005b

Add BCC support for rs_object_slots metadata.

This is added to support proper cleanup of RS resources. We were leaking some
global resources because there was no way to tell which slots to clear.

Change-Id: I3e01ff4f7105444b7610d514f10dd56cb1b359b8
b: 3381615

lib/bcc/CacheWriter.cpp

diff --git a/lib/bcc/CacheWriter.cpp b/lib/bcc/CacheWriter.cpp
index 6d3a104..27ffd6d 100644
--- a/lib/bcc/CacheWriter.cpp
+++ b/lib/bcc/CacheWriter.cpp
@@ -47,6 +47,7 @@
   CHECK_AND_FREE(mpExportFuncListSection);
   CHECK_AND_FREE(mpPragmaListSection);
   CHECK_AND_FREE(mpFuncTableSection);
+  CHECK_AND_FREE(mpObjectSlotSection);
 
 #undef CHECK_AND_FREE
 }
@@ -68,6 +69,7 @@
              && prepareStringPool()
              && prepareExportVarList()
              && prepareExportFuncList()
+             && prepareObjectSlotList()
              && calcSectionOffset()
              && calcContextChecksum()
              && writeAll()
@@ -307,6 +309,29 @@
 }
 
 
+bool CacheWriter::prepareObjectSlotList() {
+  size_t objectSlotCount = mpOwner->getObjectSlotCount();
+
+  size_t listSize = sizeof(OBCC_ObjectSlotList) +
+                    sizeof(uint32_t) * objectSlotCount;
+
+  OBCC_ObjectSlotList *list = (OBCC_ObjectSlotList *)malloc(listSize);
+
+  if (!list) {
+    LOGE("Unable to allocate for object slot list\n");
+    return false;
+  }
+
+  mpObjectSlotSection = list;
+  mpHeaderSection->object_slot_list_size = listSize;
+
+  list->count = objectSlotCount;
+
+  mpOwner->getObjectSlotList(objectSlotCount, list->object_slot_list);
+  return true;
+}
+
+
 bool CacheWriter::calcSectionOffset() {
   size_t offset = sizeof(OBCC_Header);
 
@@ -330,6 +355,7 @@
   OFFSET_INCREASE(export_func_list);
   OFFSET_INCREASE(pragma_list);
   OFFSET_INCREASE(func_table);
+  OFFSET_INCREASE(object_slot_list);
 
 #undef OFFSET_INCREASE
 
@@ -388,6 +414,7 @@
   WRITE_SECTION_SIMPLE(export_func_list, mpExportFuncListSection);
   WRITE_SECTION_SIMPLE(pragma_list, mpPragmaListSection);
   WRITE_SECTION_SIMPLE(func_table, mpFuncTableSection);
+  WRITE_SECTION_SIMPLE(object_slot_list, mpObjectSlotSection);
 
   WRITE_SECTION(context, mpHeaderSection->context_offset, BCC_CONTEXT_SIZE,
                 mpOwner->getContext());