[Emacs-diffs] trunk r117118: Always map new memory for buffers after dumping.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117118
revision-id: address@hidden
parent: address@hidden
author: Fabrice Popineau <address@hidden>
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2014-05-17 10:14:59 +0300
message:
  Always map new memory for buffers after dumping.
  
   src/buffer.c (init_buffer) [USE_MMAP_FOR_BUFFERS]: Always map new
   memory for every buffer that was dumped.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/buffer.c                   buffer.c-20091113204419-o5vbwnq5f7feedwu-264

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-05-15 14:59:02 +0000
+++ b/src/ChangeLog     2014-05-17 07:14:59 +0000
@@ -1,3 +1,8 @@
+2014-05-17  Fabrice Popineau  <address@hidden>
+
+       * buffer.c (init_buffer) [USE_MMAP_FOR_BUFFERS]: Always map new
+       memory for every buffer that was dumped.
+
 2014-05-15  Dmitry Antipov  <address@hidden>
 
        * fns.c (Freverse): Allow vectors, bool vectors and strings.

=== modified file 'src/buffer.c'
--- a/src/buffer.c      2014-05-04 19:37:56 +0000
+++ b/src/buffer.c      2014-05-17 07:14:59 +0000
@@ -5336,16 +5336,17 @@
   ptrdiff_t len;
 
 #ifdef USE_MMAP_FOR_BUFFERS
- {
-   /* When using the ralloc implementation based on mmap(2), buffer
-      text pointers will have been set to null in the dumped Emacs.
-      Map new memory.  */
-   struct buffer *b;
+  {
+    struct buffer *b;
 
-   FOR_EACH_BUFFER (b)
-     if (b->text->beg == NULL)
-       enlarge_buffer_text (b, 0);
- }
+    /* We cannot dump buffers with meaningful addresses that can be
+       used by the dumped Emacs.  We map new memory for them here.  */
+    FOR_EACH_BUFFER (b)
+      {
+       b->text->beg = NULL;
+       enlarge_buffer_text (b, 0);
+      }
+  }
 #endif /* USE_MMAP_FOR_BUFFERS */
 
   Fset_buffer (Fget_buffer_create (build_string ("*scratch*")));