[arrayfire] 144/284: Renamed is_free -> mngr_lock and is_unlinked -> user_lock in opencl memory mngr
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Sun Feb 7 18:59:27 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/experimental
in repository arrayfire.
commit cef8559e520276e08b38b38861a697fbcfde2a37
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date: Fri Jan 1 12:40:21 2016 -0500
Renamed is_free -> mngr_lock and is_unlinked -> user_lock in opencl memory mngr
---
src/backend/opencl/memory.cpp | 60 +++++++++++++++++++++----------------------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/backend/opencl/memory.cpp b/src/backend/opencl/memory.cpp
index 2c9a613..1ba4ce1 100644
--- a/src/backend/opencl/memory.cpp
+++ b/src/backend/opencl/memory.cpp
@@ -60,8 +60,8 @@ namespace opencl
typedef struct
{
- bool is_free;
- bool is_unlinked;
+ bool mngr_lock;
+ bool user_lock;
size_t bytes;
} mem_info;
@@ -84,9 +84,9 @@ namespace opencl
for(mem_iter iter = memory_maps[n].begin();
iter != memory_maps[n].end(); ++iter) {
- if ((iter->second).is_free) {
+ if (!(iter->second).mngr_lock) {
- if (!(iter->second).is_unlinked) {
+ if (!(iter->second).user_lock) {
destroy(iter->first);
total_bytes[n] -= iter->second.bytes;
}
@@ -97,7 +97,7 @@ namespace opencl
mem_iter memory_end = memory_maps[n].end();
while(memory_curr != memory_end) {
- if (memory_curr->second.is_free && !memory_curr->second.is_unlinked) {
+ if (!memory_curr->second.mngr_lock && !memory_curr->second.user_lock) {
memory_curr = memory_maps[n].erase(memory_curr);
} else {
++memory_curr;
@@ -117,14 +117,14 @@ namespace opencl
for(mem_iter iter = memory_maps[device].begin();
iter != memory_maps[device].end(); ++iter) {
- std::string status_af("Unknown");
- std::string status_us("Unknown");
+ std::string status_mngr("Unknown");
+ std::string status_user("Unknown");
- if(!(iter->second.is_free)) status_af = "Yes";
- else status_af = " No";
+ if(iter->second.mngr_lock) status_mngr = "Yes";
+ else status_mngr = " No";
- if((iter->second.is_unlinked)) status_us = "Yes";
- else status_us = " No";
+ if(iter->second.user_lock) status_user = "Yes";
+ else status_user = " No";
std::string unit = "KB";
double size = (double)(iter->second.bytes) / 1024;
@@ -135,8 +135,8 @@ namespace opencl
std::cout << "| " << std::right << std::setw(14) << iter->first << " "
<< " | " << std::setw(7) << std::setprecision(4) << size << " " << unit
- << " | " << std::setw(9) << status_af
- << " | " << std::setw(9) << status_us
+ << " | " << std::setw(9) << status_mngr
+ << " | " << std::setw(9) << status_user
<< " |" << std::endl;
}
@@ -162,11 +162,11 @@ namespace opencl
mem_info info = iter->second;
- if ( info.is_free &&
- !info.is_unlinked &&
+ if (!info.mngr_lock &&
+ !info.user_lock &&
info.bytes == alloc_bytes) {
- iter->second.is_free = false;
+ iter->second.mngr_lock = true;
used_bytes[n] += alloc_bytes;
used_buffers[n]++;
return iter->first;
@@ -180,7 +180,7 @@ namespace opencl
ptr = new cl::Buffer(getContext(), CL_MEM_READ_WRITE, alloc_bytes);
}
- mem_info info = {false, false, alloc_bytes};
+ mem_info info = {true, false, alloc_bytes};
memory_maps[n][ptr] = info;
used_bytes[n] += alloc_bytes;
used_buffers[n]++;
@@ -201,10 +201,10 @@ namespace opencl
if (iter != memory_maps[n].end()) {
- iter->second.is_free = true;
- if ((iter->second).is_unlinked && !free_unlinked) return;
+ iter->second.mngr_lock = false;
+ if ((iter->second).user_lock && !free_unlinked) return;
- iter->second.is_unlinked = false;
+ iter->second.user_lock = false;
used_bytes[n] -= iter->second.bytes;
used_buffers[n]--;
@@ -219,11 +219,11 @@ namespace opencl
mem_iter iter = memory_maps[n].find(ptr);
if (iter != memory_maps[n].end()) {
- iter->second.is_unlinked = true;
+ iter->second.user_lock = true;
} else {
- mem_info info = { false,
- false,
+ mem_info info = { true,
+ true,
100 }; //This number is not relevant
memory_maps[n][ptr] = info;
@@ -236,7 +236,7 @@ namespace opencl
mem_iter iter = memory_maps[n].find(ptr);
if (iter != memory_maps[n].end()) {
- iter->second.is_unlinked = false;
+ iter->second.user_lock = false;
}
}
@@ -302,7 +302,7 @@ namespace opencl
{
int n = getActiveDeviceId();
for(auto &iter : pinned_maps[n]) {
- if ((iter.second).info.is_free) {
+ if (!(iter.second).info.mngr_lock) {
pinnedDestroy(iter.second.buf, iter.first);
}
}
@@ -311,7 +311,7 @@ namespace opencl
pinned_iter memory_end = pinned_maps[n].end();
while(memory_curr != memory_end) {
- if (memory_curr->second.info.is_free) {
+ if (!memory_curr->second.info.mngr_lock) {
memory_curr = pinned_maps[n].erase(memory_curr);
} else {
++memory_curr;
@@ -341,8 +341,8 @@ namespace opencl
iter != pinned_maps[n].end(); ++iter) {
mem_info info = iter->second.info;
- if (info.is_free && info.bytes == alloc_bytes) {
- iter->second.info.is_free = false;
+ if (!info.mngr_lock && info.bytes == alloc_bytes) {
+ iter->second.info.mngr_lock = true;
pinned_used_bytes += alloc_bytes;
return iter->first;
}
@@ -360,7 +360,7 @@ namespace opencl
ptr = getQueue().enqueueMapBuffer(*buf, true, CL_MAP_READ|CL_MAP_WRITE,
0, alloc_bytes);
}
- mem_info info = {false, false, alloc_bytes};
+ mem_info info = {true, false, alloc_bytes};
pinned_info pt = {buf, info};
pinned_maps[n][ptr] = pt;
pinned_used_bytes += alloc_bytes;
@@ -374,7 +374,7 @@ namespace opencl
pinned_iter iter = pinned_maps[n].find(ptr);
if (iter != pinned_maps[n].end()) {
- iter->second.info.is_free = true;
+ iter->second.info.mngr_lock = false;
pinned_used_bytes -= iter->second.info.bytes;
} else {
pinnedDestroy(iter->second.buf, ptr); // Free it because we are not sure what the size is
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git
More information about the debian-science-commits
mailing list