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

Side by Side Diff: third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.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) 2005, Google Inc. 1 // Copyright (c) 2005, 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 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 int result; 214 int result;
215 if (!MallocHook::InvokeMunmapReplacement(start, length, &result)) { 215 if (!MallocHook::InvokeMunmapReplacement(start, length, &result)) {
216 result = syscall(SYS_munmap, start, length); 216 result = syscall(SYS_munmap, start, length);
217 } 217 }
218 return result; 218 return result;
219 } 219 }
220 220
221 #undef MALLOC_HOOK_HAVE_DO_MMAP64 221 #undef MALLOC_HOOK_HAVE_DO_MMAP64
222 222
223 #endif // #ifdef MALLOC_HOOK_HAVE_DO_MMAP64 223 #endif // #ifdef MALLOC_HOOK_HAVE_DO_MMAP64
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698