Skip to content

A bench bug: extra cout makes the bench correct #1739

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

Draft
wants to merge 3 commits into
base: branch-1.2
Choose a base branch
from
Draft

A bench bug: extra cout makes the bench correct #1739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e37f4d
wip
da-liii Mar 19, 2024
8a7b185
wip
da-liii Mar 19, 2024
679c63c
wip
da-liii Mar 19, 2024
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
5 changes: 2 additions & 3 deletions src/Data/Tree/tree_observer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,6 @@ apply (tree& ref, modification mod) {
if (busy_modifying) raw_apply (ref, mod);
else if (is_busy) {
if (ip_attached (ip) && !busy_path (p)) {
// cout << "Postpone " << (reverse (ip) * mod) << "\n";
busy_paths= busy_paths * p;
upcoming = upcoming * (reverse (ip) * mod);
}
Expand All @@ -495,9 +494,9 @@ apply (tree& ref, modification mod) {
busy_paths= list<path> (p);
upcoming = list<modification> (reverse (ip) * mod);
while (!is_nil (upcoming)) {
// cout << "Handle " << upcoming->item << "\n";
cout << "Handle " << upcoming->item << "\n";
raw_apply (the_et, upcoming->item);
// cout << "Done " << upcoming->item << "\n";
cout << "Done " << upcoming->item << "\n";
upcoming= upcoming->next;
}
busy_paths= list<path> ();
Expand Down
2 changes: 2 additions & 0 deletions src/Edit/Interface/edit_keyboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,9 @@ edit_interface_rep::key_press (string gkey) {
pre_edit_mark= new_marker ();
mark_start (pre_edit_mark);
archive_state ();
bench_start ("pre_edit");
insert_tree (compound ("pre-edit", s), path (0, pos));
bench_end ("pre_edit");
return;
}
}
Expand Down
8 changes: 8 additions & 0 deletions src/Edit/Modify/edit_text.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,15 +236,23 @@ edit_text_rep::insert_tree (tree t, path p_in_t) {
go_to (correct_cursor (et, p * p_in_t));
}
else {
bench_start ("branch");
bench_start ("prepare_for_insert");
path p= prepare_for_insert ();
bench_end ("prepare_for_insert");
bench_start ("insert");
if (!is_concat (t)) {
t = tree (CONCAT, t);
p_in_t= path (0, p_in_t);
}
insert (p, t);
path q= path_add (p, p_in_t->item) * p_in_t->next;
go_to (correct_cursor (et, q));
bench_end ("insert");
bench_start ("correct_concat");
correct_concat (path_up (p));
bench_end ("correct_concat");
bench_end ("branch");
}
}

Expand Down
10 changes: 8 additions & 2 deletions src/Plugins/Qt/qt_gui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,8 +882,14 @@ qt_gui_rep::force_update () {

void
qt_gui_rep::need_update () {
if (updating) needing_update= true;
else updatetimer->start (0);
if (updating) {
needing_update= true;
cout << "need updating" << LF;
}
else {
cout << "need update: start now" << LF;
updatetimer->start (0);
}
// 0 ms - call immediately when all other events have been processed
}

Expand Down