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

Side by Side Diff: third_party/tcmalloc/chromium/src/google/malloc_extension_c.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) 2008, Google Inc. 1 /* Copyright (c) 2008, 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 73
74 PERFTOOLS_DLL_DECL int MallocExtension_GetNumericProperty(const char* property, size_t* value); 74 PERFTOOLS_DLL_DECL int MallocExtension_GetNumericProperty(const char* property, size_t* value);
75 PERFTOOLS_DLL_DECL int MallocExtension_SetNumericProperty(const char* property, size_t value); 75 PERFTOOLS_DLL_DECL int MallocExtension_SetNumericProperty(const char* property, size_t value);
76 PERFTOOLS_DLL_DECL void MallocExtension_MarkThreadIdle(void); 76 PERFTOOLS_DLL_DECL void MallocExtension_MarkThreadIdle(void);
77 PERFTOOLS_DLL_DECL void MallocExtension_MarkThreadBusy(void); 77 PERFTOOLS_DLL_DECL void MallocExtension_MarkThreadBusy(void);
78 PERFTOOLS_DLL_DECL void MallocExtension_ReleaseToSystem(size_t num_bytes); 78 PERFTOOLS_DLL_DECL void MallocExtension_ReleaseToSystem(size_t num_bytes);
79 PERFTOOLS_DLL_DECL void MallocExtension_ReleaseFreeMemory(void); 79 PERFTOOLS_DLL_DECL void MallocExtension_ReleaseFreeMemory(void);
80 PERFTOOLS_DLL_DECL size_t MallocExtension_GetEstimatedAllocatedSize(size_t size) ; 80 PERFTOOLS_DLL_DECL size_t MallocExtension_GetEstimatedAllocatedSize(size_t size) ;
81 PERFTOOLS_DLL_DECL size_t MallocExtension_GetAllocatedSize(void* p); 81 PERFTOOLS_DLL_DECL size_t MallocExtension_GetAllocatedSize(void* p);
82 82
83 /*
84 * NOTE: These enum values MUST be kept in sync with the version in
85 * malloc_extension.h
86 */
87 typedef enum {
88 MallocExtension_kUnknownOwnership = 0,
89 MallocExtension_kOwned,
90 MallocExtension_kNotOwned
91 } MallocExtension_Ownership;
92
93 PERFTOOLS_DLL_DECL MallocExtension_Ownership MallocExtension_GetOwnership(const void* p);
94
83 #ifdef __cplusplus 95 #ifdef __cplusplus
84 } // extern "C" 96 } // extern "C"
85 #endif 97 #endif
86 98
87 #endif /* _MALLOC_EXTENSION_C_H_ */ 99 #endif /* _MALLOC_EXTENSION_C_H_ */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698