← Back to branch summary

~ubuntu-branches/ubuntu/lucid/erlang/lucid-updates

« back to all changes in this revision

Viewing changes to erts/emulator/beam/copy.c

  • Committer: Elliot Murphy
  • Date: 2009-12-22 02:56:21 UTC
  • mfrom: (3.3.5 sid)
  • Revision ID: elliot@elliotmurphy.com-20091222025621-qv3rja8gbpiabkbe
Tags: 1:13.b.3-dfsg-2ubuntu1
* Merge with Debian testing; remaining Ubuntu changes:
  - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not
    supposed to. (LP #438365)
  - Drop erlang-wx binary.
  - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they
    do not really need wx. Also drop it from -debugger; the GUI needs wx,
    but it apparently has CLI bits as well, and is also needed by -megaco,
    so let's keep the package for now.
* Fixed dialyzer(1) manpage which was placed into section 3 and conflicted
  with dialyzer(3erl).
* New upstream release (it adds a new binary package erlang-erl-docgen).
* Refreshed patches, removed most of emacs.patch which is applied upstream.
* Linked run_test binary from erlang-common-test package to /usr/bin.
* Fixed VCS headers in debian/control.
* Moved from prebuilt manpages to generated from sources. This adds
  erlang-manpages binary package and xsltproc build dependency.

Show diffs side-by-side

added added

removed removed

Lines of Context:
erts/emulator/beam/copy.c
322
322
                    pb->next = off_heap->mso;
323
323
                    pb->flags = 0;
324
324
                    off_heap->mso = pb;
325
 
                    off_heap->overhead += pb->size /
326
 
                      BINARY_OVERHEAD_FACTOR / sizeof(Eterm);
 
325
                    off_heap->overhead += pb->size / sizeof(Eterm);
327
326
                }
328
327
                break;
329
328
            case SUB_BINARY_SUBTAG:
372
371
                        to->next = off_heap->mso;
373
372
                        to->flags = 0;
374
373
                        off_heap->mso = to;
375
 
                        off_heap->overhead += to->size /
376
 
                          BINARY_OVERHEAD_FACTOR / sizeof(Eterm);
 
374
                        off_heap->overhead += to->size / sizeof(Eterm);
377
375
                    }
378
376
                    *argp = make_binary(hbot);
379
377
                    if (extra_bytes != 0) {
659
657
                erts_refc_inc(&pb->val->refc, 2);
660
658
                pb->next = erts_global_offheap.mso;
661
659
                erts_global_offheap.mso = pb;
662
 
                erts_global_offheap.overhead += pb->size /
663
 
                    BINARY_OVERHEAD_FACTOR / sizeof(Eterm);
 
660
                erts_global_offheap.overhead += pb->size / sizeof(Eterm);
664
661
                continue;
665
662
            }
666
663
 
785
782
                    to_bin->bytes = from_bin->bytes + sub_offset;
786
783
                    to_bin->next = erts_global_offheap.mso;
787
784
                    erts_global_offheap.mso = to_bin;
788
 
                    erts_global_offheap.overhead += to_bin->size /
789
 
                        BINARY_OVERHEAD_FACTOR / sizeof(Eterm);
 
785
                    erts_global_offheap.overhead += to_bin->size / sizeof(Eterm);
790
786
                    res_binary=make_binary(to_bin);
791
787
                    hp += PROC_BIN_SIZE;
792
788
                }
929
925
                    erts_refc_inc(&pb->val->refc, 2);
930
926
                    pb->next = off_heap->mso;
931
927
                    off_heap->mso = pb;
 
928
                    off_heap->overhead += pb->size / sizeof(Eterm);
932
929
                }
933
930
                break;
934
931
            case FUN_SUBTAG: