lmh188
/
code_twain
mirror of http://192.168.10.5:8099/sane/code_twain.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

optimize nested calling log

This commit is contained in:
gb 2023-05-15 09:02:58 +08:00
parent 957c901dc9
commit 9c1fab4368
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
twain/twain/huagaods.cpp
View File

@ -1571,6 +1571,7 @@ Twpp::Result huagao_ds::setupFileXferReset(const Twpp::Identity& origin, Twpp::S
} }
Result huagao_ds::call(const Identity& origin, DataGroup dg, Dat dat, Msg msg, void* data) { Result huagao_ds::call(const Identity& origin, DataGroup dg, Dat dat, Msg msg, void* data) {
static bool in_calling = false; static bool in_calling = false;
static unsigned nested_events = 0;
bool calling = in_calling; bool calling = in_calling;
if (calling) if (calling)
@ -1585,7 +1586,9 @@ Result huagao_ds::call(const Identity& origin, DataGroup dg, Dat dat, Msg msg, v
} }
else else
{ {
if(nested_events == 0)
load_sane_util::log_info(L"Nested Call: discard 'Msg::ProcessEvent'!\r\n", 0); load_sane_util::log_info(L"Nested Call: discard 'Msg::ProcessEvent'!\r\n", 0);
nested_events++;
return { ReturnCode::NotDsEvent, ConditionCode::Success }; return { ReturnCode::NotDsEvent, ConditionCode::Success };
} }
} }
@ -1600,6 +1603,13 @@ Result huagao_ds::call(const Identity& origin, DataGroup dg, Dat dat, Msg msg, v
{ {
in_calling = true; in_calling = true;
} }
if (nested_events > 1)
{
wchar_t buf[256] = { 0 };
swprintf_s(buf, _countof(buf) - 1, L"Discard %u nested Msg::ProcessEvent messages before.\r\n", nested_events);
load_sane_util::log_info(buf, 0);
}
nested_events = 0;
try { try {
// we can override almost anything from SourceFromThis, even the top-most source instance call // we can override almost anything from SourceFromThis, even the top-most source instance call