diff options
author | Ton Roosendaal <ton@blender.org> | 2006-01-29 14:36:33 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-01-29 14:36:33 +0300 |
commit | 2f8708da0282c6abcdd6c2301b708dadc4ddb430 (patch) | |
tree | 069b1e741e6ddc7a6a566163f5378ddbf76684d6 /source/blender/blenlib/BLI_threads.h | |
parent | 9ccdad0d13bacba1d0c6995efe23bc77b7866050 (diff) |
Three-in-one commit:
- Compositor now is threaded
Enable it with the Scene buttons "Threads". This will handle over nodes to
individual threads to be calculated. However, if nodes depend on others
they have to wait. The current system only threads per entire node, not for
calculating results in parts.
I've reshuffled the node execution code to evaluate 'changed' events, and
prepare the entire tree to become simply parsed for open jobs with a call
to node = getExecutableNode()
By default, even without 'thread' option active, all node execution is
done within a separate thread.
Also fixed issues in yesterdays commit for 'event based' calculations, it
didn't do animated images, or execute (on rendering) the correct nodes
when you don't have Render-Result nodes included.
- Added generic Thread support in blenlib/ module
The renderer and the node system now both use same code for controlling the
threads. This has been moved to a new C file in blenlib/intern/threads.c.
Check this c file for an extensive doc and example how to use it.
The current implementation for Compositing allows unlimited amount of
threads. For rendering it is still tied to two threads, although it is
pretty easy to extend to 4 already. People with giant amounts of cpus can
poke me once for tests. :)
- Bugfix in creating group nodes
Group node definitions demand a clear separation of 'internal sockets' and
'external sockets'. The first are sockets being linked internally, the latter
are sockets exposed as sockets for the group itself.
When sockets were linked both internal and external, Blender crashed. It is
solved now by removing the external link(s).
Diffstat (limited to 'source/blender/blenlib/BLI_threads.h')
-rw-r--r-- | source/blender/blenlib/BLI_threads.h | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/source/blender/blenlib/BLI_threads.h b/source/blender/blenlib/BLI_threads.h new file mode 100644 index 00000000000..5ab8c2a0b3f --- /dev/null +++ b/source/blender/blenlib/BLI_threads.h @@ -0,0 +1,44 @@ +/* + * + * $Id: + * + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * The Original Code is Copyright (C) 2006 Blender Foundation. + * All rights reserved. + * + * The Original Code is: all of this file. + * + * Contributor(s): none yet. + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#ifndef BLI_THREADS_H +#define BLI_THREADS_H + + +void BLI_init_threads (ListBase *threadbase, int (*do_thread)(void *), int tot); +int BLI_available_threads(ListBase *threadbase); +int BLI_available_thread_index(ListBase *threadbase); +void BLI_insert_thread (ListBase *threadbase, void *callerdata); +void BLI_remove_thread (ListBase *threadbase, void *callerdata); +void BLI_end_threads (ListBase *threadbase); + + +#endif + |