Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Side by Side Diff: third_party/tcmalloc/chromium/src/libc_override_osx.h

Issue 7430007: Merge tcmalloc r111 (perftools v. 1.8) with the chromium/ branch. Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011, Google Inc. 1 // Copyright (c) 2011, Google Inc.
2 // All rights reserved. 2 // All rights reserved.
3 // 3 //
4 // Redistribution and use in source and binary forms, with or without 4 // Redistribution and use in source and binary forms, with or without
5 // modification, are permitted provided that the following conditions are 5 // modification, are permitted provided that the following conditions are
6 // met: 6 // met:
7 // 7 //
8 // * Redistributions of source code must retain the above copyright 8 // * Redistributions of source code must retain the above copyright
9 // notice, this list of conditions and the following disclaimer. 9 // notice, this list of conditions and the following disclaimer.
10 // * Redistributions in binary form must reproduce the above 10 // * Redistributions in binary form must reproduce the above
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 // default zone makes the more recently registered zone the default 248 // default zone makes the more recently registered zone the default
249 // zone. The default zone is then re-registered to ensure that 249 // zone. The default zone is then re-registered to ensure that
250 // allocations made from it earlier will be handled correctly. 250 // allocations made from it earlier will be handled correctly.
251 // Things are not guaranteed to work that way, but it's how they work now. 251 // Things are not guaranteed to work that way, but it's how they work now.
252 malloc_zone_t *default_zone = malloc_default_zone(); 252 malloc_zone_t *default_zone = malloc_default_zone();
253 malloc_zone_unregister(default_zone); 253 malloc_zone_unregister(default_zone);
254 malloc_zone_register(default_zone); 254 malloc_zone_register(default_zone);
255 } 255 }
256 256
257 #endif // TCMALLOC_LIBC_OVERRIDE_OSX_INL_H_ 257 #endif // TCMALLOC_LIBC_OVERRIDE_OSX_INL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698