tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Fix #32579: Sequencer crash when changing render dimensions 

Memory limitor's queue could be affected when it's being iterated
on enforcing limits -- that's because iteration could free color
managed image buffers.

Fixed by getting least priority element after every element was
freed. Could be optimized a bit, but it anyway shouldn't be so
slow due to specific of cache limiting and limit enforcing finish
condition.
This commit is contained in:
Sergey Sharybin 2012-09-20 12:59:16 +00:00
parent 5327c2f486
commit a4f73c5694
2 changed files with 23 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
intern/memutil/MEM_CacheLimiter.h
View File

@ -123,20 +123,11 @@ public:
parent->touch(this); parent->touch(this);
} }
void set_priority(int priority) {
this->priority = priority;
}
int get_priority(void) {
return this->priority;
}
private: private:
friend class MEM_CacheLimiter<T>; friend class MEM_CacheLimiter<T>;
T * data; T * data;
int refcount; int refcount;
int priority;
typename std::list<MEM_CacheLimiterHandle<T> *, MEM_Allocator<MEM_CacheLimiterHandle<T> *> >::iterator me; typename std::list<MEM_CacheLimiterHandle<T> *, MEM_Allocator<MEM_CacheLimiterHandle<T> *> >::iterator me;
MEM_CacheLimiter<T> * parent; MEM_CacheLimiter<T> * parent;
}; };
@ -171,7 +162,6 @@ public:
} }
void enforce_limits() { void enforce_limits() {
MEM_CachePriorityQueue priority_queue;
size_t max = MEM_CacheLimiter_get_maximum(); size_t max = MEM_CacheLimiter_get_maximum();
size_t mem_in_use, cur_size; size_t mem_in_use, cur_size;
@ -190,12 +180,11 @@ public:
return; return;
} }
priority_queue = get_priority_queue(); while (!queue.empty() && mem_in_use > max) {
MEM_CacheElementPtr elem = get_least_priority_destroyable_element();
while (!priority_queue.empty() && mem_in_use > max) { if (!elem)
MEM_CacheElementPtr elem = priority_queue.top(); break;
priority_queue.pop();
if (getDataSize) { if (getDataSize) {
cur_size = getDataSize(elem->get()->get_data()); cur_size = getDataSize(elem->get()->get_data());
@ -232,14 +221,6 @@ private:
typedef std::list<MEM_CacheElementPtr, MEM_Allocator<MEM_CacheElementPtr> > MEM_CacheQueue; typedef std::list<MEM_CacheElementPtr, MEM_Allocator<MEM_CacheElementPtr> > MEM_CacheQueue;
typedef typename MEM_CacheQueue::iterator iterator; typedef typename MEM_CacheQueue::iterator iterator;
struct compare_element_priority : public std::binary_function<MEM_CacheElementPtr, MEM_CacheElementPtr, bool> {
bool operator()(const MEM_CacheElementPtr left_elem, const MEM_CacheElementPtr right_elem) const {
return left_elem->get_priority() > right_elem->get_priority();
}
};
typedef std::priority_queue<MEM_CacheElementPtr, std::vector<MEM_CacheElementPtr>, compare_element_priority > MEM_CachePriorityQueue;
size_t total_size() { size_t total_size() {
size_t size = 0; size_t size = 0;
for (iterator it = queue.begin(); it != queue.end(); it++) { for (iterator it = queue.begin(); it != queue.end(); it++) {
@ -248,28 +229,35 @@ private:
return size; return size;
} }
MEM_CachePriorityQueue get_priority_queue(void) { MEM_CacheElementPtr get_least_priority_destroyable_element(void) {
MEM_CachePriorityQueue priority_queue; if (queue.empty())
return NULL;
if (!getItemPriority)
return *queue.begin();
MEM_CacheElementPtr best_match_elem = NULL;
int best_match_priority = 0;
iterator it; iterator it;
int i; int i;
for (it = queue.begin(), i = 0; it != queue.end(); it++, i++) { for (it = queue.begin(), i = 0; it != queue.end(); it++, i++) {
MEM_CacheElementPtr elem = *it; MEM_CacheElementPtr elem = *it;
int priority;
if (!elem->can_destroy())
continue;
/* by default 0 means higherst priority element */ /* by default 0 means higherst priority element */
priority = -(queue.size() - i - 1); int priority = -(queue.size() - i - 1);
priority = getItemPriority(elem->get()->get_data(), priority);
if (getItemPriority) { if (priority < best_match_priority || best_match_elem == NULL) {
priority = getItemPriority(elem->get()->get_data(), priority); best_match_priority = priority;
best_match_elem = elem;
} }
elem->set_priority(priority);
priority_queue.push(elem);
} }
return priority_queue; return best_match_elem;
} }
MEM_CacheQueue queue; MEM_CacheQueue queue;

2
source/blender/imbuf/intern/moviecache.c
View File

@ -386,7 +386,7 @@ ImBuf *IMB_moviecache_get(MovieCache *cache, void *userkey)
void IMB_moviecache_free(MovieCache *cache) void IMB_moviecache_free(MovieCache *cache)
{ {
PRINT("%s: create '%s' free\n", __func__, cache->name); PRINT("%s: cache '%s' free\n", __func__, cache->name);
BLI_ghash_free(cache->hash, moviecache_keyfree, moviecache_valfree); BLI_ghash_free(cache->hash, moviecache_keyfree, moviecache_valfree);