Skip to content

减少拷贝构造次数 #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

减少拷贝构造次数 #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 10 additions & 26 deletions library/src/main/cpp/bitmap_monitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,25 +264,23 @@ static void* thread_routine(void *) {
sleep_some_time();
continue;
}
auto bitmap_records = g_ctx.bitmap_records;
std::vector<BitmapRecord> copy_records;
auto& bitmap_records = g_ctx.bitmap_records;

if (bitmap_records.empty()) {
g_ctx.record_mutex.unlock();
sleep_some_time();
continue;
}

int index = 0;
long long sum_bytes_alloc = 0;
//check java bitmap object recycle state
for (auto it = bitmap_records.begin(); it != bitmap_records.end(); it++) {
index++;
for (auto it = bitmap_records.begin(); it != bitmap_records.end(); /* ++it */) {
//1.whether is reachable
jboolean object_recycled = env->IsSameObject(it->java_bitmap_ref, nullptr);

if (object_recycled == JNI_TRUE) {
//not reachable
it = bitmap_records.erase(it);
continue;
}

Expand All @@ -294,35 +292,22 @@ static void* thread_routine(void *) {
if (bitmap_recycled) {
//recycled
env->DeleteLocalRef(bitmap_local_ref);
it = bitmap_records.erase(it);
continue;
}

//not recycled, add for next check
//not recycled, next check
sum_bytes_alloc += (it->height * it->stride);
copy_records.push_back({
.native_ptr = it->native_ptr,
.width = it->width,
.height = it->height,
.stride = it->stride,
.format = it->format,
.time = it->time,
.large_bitmap_save_path = it->large_bitmap_save_path,
.java_bitmap_ref = it->java_bitmap_ref,
.java_stack_jstring = it->java_stack_jstring,
.current_scene = it->current_scene,
.restore_succeed = it->restore_succeed,
});
env->DeleteLocalRef(bitmap_local_ref);
}

if (copy_records.size() != bitmap_records.size()) {
g_ctx.bitmap_records = copy_records;
++it;
}

int64_t remain_bitmap_count = bitmap_records.size();

g_ctx.record_mutex.unlock();

//report data
int64_t remain_bitmap_count = copy_records.size();
jobject bitmap_info_jobject = create_bitmap_info_java_object(env, remain_bitmap_count,
sum_bytes_alloc, nullptr);
env->CallStaticVoidMethod(g_ctx.bitmap_monitor_jclass, g_ctx.report_bitmap_data_method,
Expand Down Expand Up @@ -420,7 +405,7 @@ jobject do_dump_info(JNIEnv *env, bool justCount, bool ensureRestoreImage) {
return nullptr;
}

auto bitmap_records = g_ctx.bitmap_records;
auto& bitmap_records = g_ctx.bitmap_records;
int64_t remain_bitmap_count = bitmap_records.size();
long long remain_bitmap_size = 0;
int index = 0;
Expand Down Expand Up @@ -467,13 +452,12 @@ jobject do_dump_info(JNIEnv *env, bool justCount, bool ensureRestoreImage) {

index++;
}
g_ctx.record_mutex.unlock();

jobject bitmap_sum_obj = create_bitmap_info_java_object(env,
remain_bitmap_count, remain_bitmap_size,
java_bitmap_record_array);

g_ctx.record_mutex.unlock();

return bitmap_sum_obj;
}

Expand Down