Updates to generated files for 4.2.1 release.android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2

Bug: 28860984
Change-Id: If12daed270ec0a85cd151aaaa432d178c8389757

2 files changed, 18 insertions, 18 deletions

diff --git a/src/android_je_iterate.c b/src/android_je_iterate.c
index 3fbbdc9..7aa4099 100644
--- a/src/android_je_iterate.c
+++ b/src/android_je_iterate.c
@@ -101,7 +101,7 @@ static void je_iterate_chunk(arena_chunk_t *chunk,
       void *rpages;
 
       size = arena_mapbits_large_size_get(chunk, pageind);
-      rpages = arena_miscelm_to_rpages(arena_miscelm_get(chunk, pageind));
+      rpages = arena_miscelm_to_rpages(arena_miscelm_get_mutable(chunk, pageind));
       callback((uintptr_t)rpages, size, arg);
     } else {
       /* Run of small allocations */
@@ -110,7 +110,7 @@ static void je_iterate_chunk(arena_chunk_t *chunk,
 
       assert(arena_mapbits_small_runind_get(chunk, pageind) == pageind);
       binind = arena_mapbits_binind_get(chunk, pageind);
-      run = &arena_miscelm_get(chunk, pageind)->run;
+      run = &arena_miscelm_get_mutable(chunk, pageind)->run;
       assert(run->binind == binind);
       size = arena_bin_info[binind].run_size;
 
diff --git a/src/android_je_mallinfo.c b/src/android_je_mallinfo.c
index 1637edd..802a3eb 100644
--- a/src/android_je_mallinfo.c
+++ b/src/android_je_mallinfo.c
@@ -21,25 +21,25 @@ struct mallinfo je_mallinfo() {
   struct mallinfo mi;
   memset(&mi, 0, sizeof(mi));
 
-  malloc_mutex_lock(&arenas_lock);
+  malloc_mutex_lock(TSDN_NULL, &arenas_lock);
   for (unsigned i = 0; i < narenas_auto; i++) {
     if (arenas[i] != NULL) {
-      malloc_mutex_lock(&arenas[i]->lock);
+      malloc_mutex_lock(TSDN_NULL, &arenas[i]->lock);
       mi.hblkhd += arenas[i]->stats.mapped;
       mi.uordblks += arenas[i]->stats.allocated_large;
       mi.uordblks += arenas[i]->stats.allocated_huge;
-      malloc_mutex_unlock(&arenas[i]->lock);
+      malloc_mutex_unlock(TSDN_NULL, &arenas[i]->lock);
 
       for (unsigned j = 0; j < NBINS; j++) {
         arena_bin_t* bin = &arenas[i]->bins[j];
 
-        malloc_mutex_lock(&bin->lock);
+        malloc_mutex_lock(TSDN_NULL, &bin->lock);
         mi.uordblks += arena_bin_info[j].reg_size * bin->stats.curregs;
-        malloc_mutex_unlock(&bin->lock);
+        malloc_mutex_unlock(TSDN_NULL, &bin->lock);
       }
     }
   }
-  malloc_mutex_unlock(&arenas_lock);
+  malloc_mutex_unlock(TSDN_NULL, &arenas_lock);
   mi.fordblks = mi.hblkhd - mi.uordblks;
   mi.usmblks = mi.hblkhd;
   return mi;
@@ -57,25 +57,25 @@ struct mallinfo __mallinfo_arena_info(size_t aidx) {
   struct mallinfo mi;
   memset(&mi, 0, sizeof(mi));
 
-  malloc_mutex_lock(&arenas_lock);
+  malloc_mutex_lock(TSDN_NULL, &arenas_lock);
   if (aidx < narenas_auto) {
     if (arenas[aidx] != NULL) {
-      malloc_mutex_lock(&arenas[aidx]->lock);
+      malloc_mutex_lock(TSDN_NULL, &arenas[aidx]->lock);
       mi.hblkhd = arenas[aidx]->stats.mapped;
       mi.ordblks = arenas[aidx]->stats.allocated_large;
       mi.uordblks = arenas[aidx]->stats.allocated_huge;
-      malloc_mutex_unlock(&arenas[aidx]->lock);
+      malloc_mutex_unlock(TSDN_NULL, &arenas[aidx]->lock);
 
       for (unsigned j = 0; j < NBINS; j++) {
         arena_bin_t* bin = &arenas[aidx]->bins[j];
 
-        malloc_mutex_lock(&bin->lock);
+        malloc_mutex_lock(TSDN_NULL, &bin->lock);
         mi.fsmblks += arena_bin_info[j].reg_size * bin->stats.curregs;
-        malloc_mutex_unlock(&bin->lock);
+        malloc_mutex_unlock(TSDN_NULL, &bin->lock);
       }
     }
   }
-  malloc_mutex_unlock(&arenas_lock);
+  malloc_mutex_unlock(TSDN_NULL, &arenas_lock);
   return mi;
 }
 
@@ -83,18 +83,18 @@ struct mallinfo __mallinfo_bin_info(size_t aidx, size_t bidx) {
   struct mallinfo mi;
   memset(&mi, 0, sizeof(mi));
 
-  malloc_mutex_lock(&arenas_lock);
+  malloc_mutex_lock(TSDN_NULL, &arenas_lock);
   if (aidx < narenas_auto && bidx < NBINS) {
     if (arenas[aidx] != NULL) {
       arena_bin_t* bin = &arenas[aidx]->bins[bidx];
 
-      malloc_mutex_lock(&bin->lock);
+      malloc_mutex_lock(TSDN_NULL, &bin->lock);
       mi.ordblks = arena_bin_info[bidx].reg_size * bin->stats.curregs;
       mi.uordblks = bin->stats.nmalloc;
       mi.fordblks = bin->stats.ndalloc;
-      malloc_mutex_unlock(&bin->lock);
+      malloc_mutex_unlock(TSDN_NULL, &bin->lock);
     }
   }
-  malloc_mutex_unlock(&arenas_lock);
+  malloc_mutex_unlock(TSDN_NULL, &arenas_lock);
   return mi;
 }