forked from bartvdbraak/blender
6eec49ed20
This commit adds memory usage information while rendering. It reports memory used by device, meaning: - For CPU it'll report real memory consumption - For GPU rendering it'll report GPU memory consumption, but it'll also mean the same memory is used from host side. This information displays information about memory requested by Cycles, not memory really allocated on a device. Real memory usage might be higher because of memory fragmentation or optimistic memory allocator. There's really nothing we can do against this. Also in contrast with blender internal's render cycles memory usage does not include memory used by scene, only memory needed by cycles itself will be displayed. So don't freak out if memory usage reported by cycles would be much lower than blender internal's. This commit also adds RenderEngine.update_memory_stats callback which is used to tell memory consumption from external engine to blender. This information is used to generate information line after rendering is finished.
115 lines
2.5 KiB
C++
115 lines
2.5 KiB
C++
/*
|
|
* Copyright 2011, Blender Foundation.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
#ifndef __UTIL_THREAD_H__
|
|
#define __UTIL_THREAD_H__
|
|
|
|
#include <boost/thread.hpp>
|
|
#include <pthread.h>
|
|
#include <queue>
|
|
|
|
#include "util_function.h"
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
/* use boost for mutexes */
|
|
|
|
typedef boost::mutex thread_mutex;
|
|
typedef boost::mutex::scoped_lock thread_scoped_lock;
|
|
typedef boost::condition_variable thread_condition_variable;
|
|
|
|
/* use boost for spinlocks as well */
|
|
typedef boost::detail::spinlock spin_lock;
|
|
|
|
/* own pthread based implementation, to avoid boost version conflicts with
|
|
* dynamically loaded blender plugins */
|
|
|
|
class thread {
|
|
public:
|
|
thread(boost::function<void(void)> run_cb_)
|
|
{
|
|
joined = false;
|
|
run_cb = run_cb_;
|
|
|
|
pthread_create(&pthread_id, NULL, run, (void*)this);
|
|
}
|
|
|
|
~thread()
|
|
{
|
|
if(!joined)
|
|
join();
|
|
}
|
|
|
|
static void *run(void *arg)
|
|
{
|
|
((thread*)arg)->run_cb();
|
|
return NULL;
|
|
}
|
|
|
|
bool join()
|
|
{
|
|
joined = true;
|
|
return pthread_join(pthread_id, NULL) == 0;
|
|
}
|
|
|
|
protected:
|
|
boost::function<void(void)> run_cb;
|
|
pthread_t pthread_id;
|
|
bool joined;
|
|
};
|
|
|
|
/* Thread Local Storage
|
|
*
|
|
* Boost implementation is a bit slow, and Mac OS X __thread is not supported
|
|
* but the pthreads implementation is optimized, so we use these macros. */
|
|
|
|
#ifdef __APPLE__
|
|
|
|
#define tls_ptr(type, name) \
|
|
pthread_key_t name
|
|
#define tls_set(name, value) \
|
|
pthread_setspecific(name, value)
|
|
#define tls_get(type, name) \
|
|
((type*)pthread_getspecific(name))
|
|
#define tls_create(type, name) \
|
|
pthread_key_create(&name, NULL)
|
|
#define tls_delete(type, name) \
|
|
pthread_key_delete(name);
|
|
|
|
#else
|
|
|
|
#ifdef __WIN32
|
|
#define __thread __declspec(thread)
|
|
#endif
|
|
|
|
#define tls_ptr(type, name) \
|
|
__thread type *name
|
|
#define tls_set(name, value) \
|
|
name = value
|
|
#define tls_get(type, name) \
|
|
name
|
|
#define tls_create(type, name)
|
|
#define tls_delete(type, name)
|
|
|
|
#endif
|
|
|
|
CCL_NAMESPACE_END
|
|
|
|
#endif /* __UTIL_THREAD_H__ */
|
|
|