Revert r22080 and re-enable tcmalloc.

Revert r22080 and re-enable tcmalloc.


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=22251

[huanr, 2009-08-02 05:51:42]

TBR

[mbelshe, 2009-08-02 17:36:54]

lgtm

On Sat, Aug 1, 2009 at 10:51 PM, <huanr@chromium.org> wrote:

> Reviewers: mbelshe,
>
> Message:
> TBR
>
> Description:
> Revert r22080 and re-enable tcmalloc.
>
>
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=22251
>
> Please review this at http://codereview.chromium.org/159771
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src/
>
> Affected files:
>  M     build/all.gyp
>  M     chrome/app/chrome_dll_main.cc
>  M     chrome/chrome.gyp
>
>
> Index: build/all.gyp
> ===================================================================
> --- build/all.gyp       (revision 22250)
> +++ build/all.gyp       (working copy)
> @@ -75,6 +75,7 @@
>             '../third_party/bsdiff/bsdiff.gyp:*',
>             '../third_party/bspatch/bspatch.gyp:*',
>             '../third_party/cld/cld.gyp:*',
> +            '../third_party/tcmalloc/tcmalloc.gyp:*',
>             '../tools/memory_watcher/memory_watcher.gyp:*',
>             '../webkit/activex_shim/activex_shim.gyp:*',
>             '../webkit/activex_shim_dll/activex_shim_dll.gyp:*',
> Index: chrome/app/chrome_dll_main.cc
> ===================================================================
> --- chrome/app/chrome_dll_main.cc       (revision 22250)
> +++ chrome/app/chrome_dll_main.cc       (working copy)
> @@ -226,8 +226,8 @@
>   _set_purecall_handler(PureCall);
>   // Gather allocation failure.
>   std::set_new_handler(&OnNoMemory);
> -  // TODO: use _set_new_mode to enable the new handler for malloc() based
> -  // failures.
> +  // Also enable the new handler for malloc() based failures.
> +  _set_new_mode(1);
>  #endif
>  }
>
> Index: chrome/chrome.gyp
> ===================================================================
> --- chrome/chrome.gyp   (revision 22250)
> +++ chrome/chrome.gyp   (working copy)
> @@ -4555,6 +4555,7 @@
>             '../third_party/modp_b64/modp_b64.gyp:*',
>             '../third_party/npapi/npapi.gyp:*',
>             '../third_party/sqlite/sqlite.gyp:*',
> +            '../third_party/tcmalloc/tcmalloc.gyp:*',
>             '../third_party/zlib/zlib.gyp:*',
>             '../webkit/tools/test_shell/test_shell.gyp:*',
>             '../webkit/webkit.gyp:*',
> @@ -4593,6 +4594,7 @@
>             '../net/net.gyp:net_resources',
>             '../build/util/support/support.gyp:*',
>             '../third_party/cld/cld.gyp:cld',
> +            '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
>             '../views/views.gyp:views',
>             '../webkit/webkit.gyp:webkit_resources',
>             '../gears/gears.gyp:gears',
>
>
>