components/desktop/firefox/patches/firefox-39-gc-memory.patch
author Jingning Ji <jingning.ji@oracle.com>
Fri, 16 Sep 2016 16:06:45 -0700
changeset 6919 7972aae0fb03
parent 5527 611b2d6efdfe
permissions -rw-r--r--
24508672 Upgrade Firefox to version 45.1.1 ESR
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5527
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     1
Remove unnecessary functions for memory.
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     2
Do not plan to send upstream.
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     3
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     4
diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     5
--- a/js/src/gc/Memory.cpp
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     6
+++ b/js/src/gc/Memory.cpp
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     7
@@ -12,21 +12,16 @@
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     8
 #include "js/HeapAPI.h"
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     9
 #include "vm/Runtime.h"
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    10
 
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    11
 #if defined(XP_WIN)
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    12
 
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    13
 #include "jswin.h"
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    14
 #include <psapi.h>
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    15
 
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    16
-#elif defined(SOLARIS)
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    17
-
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    18
-#include <sys/mman.h>
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    19
-#include <unistd.h>
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    20
-
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    21
 #elif defined(XP_UNIX)
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    22
 
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    23
 #include <algorithm>
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    24
 #include <errno.h>
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    25
 #include <sys/mman.h>
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    26
 #include <sys/resource.h>
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    27
 #include <sys/stat.h>
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    28
 #include <sys/types.h>
6919
7972aae0fb03 24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents: 5527
diff changeset
    29
@@ -346,85 +346,6 @@ DeallocateMappedContent(void* p, size_t
5527
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    30
     // TODO: Bug 988813 - Support memory mapped array buffer for Windows platform.
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    31
 }
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    32
 
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    33
-#elif defined(SOLARIS)
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    34
-
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    35
-#ifndef MAP_NOSYNC
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    36
-# define MAP_NOSYNC 0
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    37
-#endif
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    38
-
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    39
-void
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    40
-InitMemorySubsystem()
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    41
-{
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    42
-    if (pageSize == 0)
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    43
-        pageSize = allocGranularity = size_t(sysconf(_SC_PAGESIZE));
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    44
-}
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    45
-
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    46
-void*
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    47
-MapAlignedPages(size_t size, size_t alignment)
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    48
-{
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    49
-    MOZ_ASSERT(size >= alignment);
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    50
-    MOZ_ASSERT(size % alignment == 0);
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    51
-    MOZ_ASSERT(size % pageSize == 0);
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    52
-    MOZ_ASSERT(alignment % allocGranularity == 0);
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    53
-
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    54
-    int prot = PROT_READ | PROT_WRITE;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    55
-    int flags = MAP_PRIVATE | MAP_ANON | MAP_ALIGN | MAP_NOSYNC;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    56
-
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    57
-    void* p = mmap((caddr_t)alignment, size, prot, flags, -1, 0);
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    58
-    if (p == MAP_FAILED)
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    59
-        return nullptr;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    60
-    return p;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    61
-}
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    62
-
6919
7972aae0fb03 24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents: 5527
diff changeset
    63
-static void*
7972aae0fb03 24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents: 5527
diff changeset
    64
-MapAlignedPagesLastDitch(size_t size, size_t alignment)
7972aae0fb03 24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents: 5527
diff changeset
    65
-{
7972aae0fb03 24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents: 5527
diff changeset
    66
-    return nullptr;
7972aae0fb03 24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents: 5527
diff changeset
    67
-}
7972aae0fb03 24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents: 5527
diff changeset
    68
-
5527
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    69
-void
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    70
-UnmapPages(void* p, size_t size)
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    71
-{
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    72
-    MOZ_ALWAYS_TRUE(0 == munmap((caddr_t)p, size));
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    73
-}
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    74
-
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    75
-bool
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    76
-MarkPagesUnused(void* p, size_t size)
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    77
-{
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    78
-    MOZ_ASSERT(OffsetFromAligned(p, pageSize) == 0);
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    79
-    return true;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    80
-}
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    81
-
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    82
-bool
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    83
-MarkPagesInUse(void* p, size_t size)
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    84
-{
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    85
-    if (!DecommitEnabled())
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    86
-        return true;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    87
-
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    88
-    MOZ_ASSERT(OffsetFromAligned(p, pageSize) == 0);
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    89
-    return true;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    90
-}
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    91
-
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    92
-size_t
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    93
-GetPageFaultCount()
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    94
-{
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    95
-    return 0;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    96
-}
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    97
-
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    98
-void*
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    99
-AllocateMappedContent(int fd, size_t offset, size_t length, size_t alignment)
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   100
-{
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   101
-    // Not implemented.
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   102
-    return nullptr;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   103
-}
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   104
-
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   105
-// Deallocate mapped memory for object.
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   106
-void
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   107
-DeallocateMappedContent(void* p, size_t length)
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   108
-{
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   109
-    // Not implemented.
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   110
-}
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   111
-
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   112
 #elif defined(XP_UNIX)
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   113
 
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   114
 void
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   115
@@ -599,17 +521,17 @@ UnmapPages(void* p, size_t size)
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   116
 
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   117
 bool
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   118
 MarkPagesUnused(void* p, size_t size)
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   119
 {
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   120
     if (!DecommitEnabled())
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   121
         return false;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   122
 
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   123
     MOZ_ASSERT(OffsetFromAligned(p, pageSize) == 0);
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   124
-    int result = madvise(p, size, MADV_DONTNEED);
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   125
+    int result = madvise((caddr_t)p, size, MADV_DONTNEED);
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   126
     return result != -1;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   127
 }
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   128
 
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   129
 bool
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   130
 MarkPagesInUse(void* p, size_t size)
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   131
 {
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   132
     if (!DecommitEnabled())
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   133
         return true;