mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-25 13:47:01 +00:00
Code Activity

add compiler attributes to allocation functions

Browse source 
Signed-off-by: Nuno Lopes <a-nlopes@microsoft.com>
This commit is contained in:
Nuno Lopes 2015-02-28 17:31:50 +00:00
parent 3bf22964dd
commit 8029e31ddd
2 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/util/memory_manager.cpp
View file

@ -173,6 +173,7 @@ void memory::display_i_max_usage(std::ostream & os) {
<< "\n"; << "\n";
} }
#if _DEBUG
void memory::deallocate(char const * file, int line, void * p) { void memory::deallocate(char const * file, int line, void * p) {
deallocate(p); deallocate(p);
TRACE_CODE(if (!g_finalizing) TRACE("memory", tout << "dealloc " << std::hex << p << std::dec << " " << file << ":" << line << "\n";);); TRACE_CODE(if (!g_finalizing) TRACE("memory", tout << "dealloc " << std::hex << p << std::dec << " " << file << ":" << line << "\n";););
@ -183,6 +184,7 @@ void * memory::allocate(char const* file, int line, char const* obj, size_t s) {
TRACE("memory", tout << "alloc " << std::hex << r << std::dec << " " << file << ":" << line << " " << obj << " " << s << "\n";); TRACE("memory", tout << "alloc " << std::hex << r << std::dec << " " << file << ":" << line << " " << obj << " " << s << "\n";);
return r; return r;
} }
#endif
#if defined(_WINDOWS) || defined(_USE_THREAD_LOCAL) #if defined(_WINDOWS) || defined(_USE_THREAD_LOCAL)
// ================================== // ==================================

27
src/util/memory_manager.h
View file

@ -23,6 +23,24 @@ Revision History:
#include<ostream> #include<ostream>
#include"z3_exception.h" #include"z3_exception.h"
#ifndef __has_builtin
# define __has_builtin(x) 0
#endif
#ifdef __GNUC__
# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 409 || __has_builtin(returns_nonnull)
# define GCC_RET_NON_NULL __attribute__((returns_nonnull))
# else
# define GCC_RET_NON_NULL
# endif
# define ALLOC_ATTR __attribute__((malloc)) GCC_RET_NON_NULL
#elif defined(_WINDOWS)
# define ALLOC_ATTR __declspec(restrict)
#else
# define ALLOC_ATTR
#endif
class out_of_memory_error : public z3_error { class out_of_memory_error : public z3_error {
public: public:
out_of_memory_error(); out_of_memory_error();
@ -39,9 +57,11 @@ public:
static void display_max_usage(std::ostream& os); static void display_max_usage(std::ostream& os);
static void display_i_max_usage(std::ostream& os); static void display_i_max_usage(std::ostream& os);
static void deallocate(void* p); static void deallocate(void* p);
static void* allocate(size_t s); static void* allocate(size_t s) ALLOC_ATTR;
#if _DEBUG
static void deallocate(char const* file, int line, void* p); static void deallocate(char const* file, int line, void* p);
static void* allocate(char const* file, int line, char const* obj, size_t s); static void* allocate(char const* file, int line, char const* obj, size_t s) ALLOC_ATTR;
#endif
static unsigned long long get_allocation_size(); static unsigned long long get_allocation_size();
static unsigned long long get_max_used_memory(); static unsigned long long get_max_used_memory();
// temporary hack to avoid out-of-memory crash in z3.exe // temporary hack to avoid out-of-memory crash in z3.exe
@ -74,6 +94,9 @@ void dealloc(T * ptr) {
#endif #endif
template<typename T>
T * alloc_vect(unsigned sz) ALLOC_ATTR;
template<typename T> template<typename T>
T * alloc_vect(unsigned sz) { T * alloc_vect(unsigned sz) {
T * r = static_cast<T*>(memory::allocate(sizeof(T) * sz)); T * r = static_cast<T*>(memory::allocate(sizeof(T) * sz));