OLD | NEW |
1 /* | 1 /* |
2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
3 * Copyright (C) 2006-2015 Eyeo GmbH | 3 * Copyright (C) 2006-2015 Eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 { | 161 { |
162 DEBUG_GENERAL("CallEngine start"); | 162 DEBUG_GENERAL("CallEngine start"); |
163 CriticalSection::Lock lock(enginePipeLock); | 163 CriticalSection::Lock lock(enginePipeLock); |
164 try | 164 try |
165 { | 165 { |
166 if (!enginePipe) | 166 if (!enginePipe) |
167 enginePipe.reset(OpenEnginePipe()); | 167 enginePipe.reset(OpenEnginePipe()); |
168 enginePipe->WriteMessage(message); | 168 enginePipe->WriteMessage(message); |
169 inputBuffer = enginePipe->ReadMessage(); | 169 inputBuffer = enginePipe->ReadMessage(); |
170 } | 170 } |
171 catch (const std::exception& e) | 171 catch (const std::exception& ex) |
172 { | 172 { |
173 DEBUG_GENERAL(e.what()); | 173 DEBUG_EXCEPTION(ex); |
174 return false; | 174 return false; |
175 } | 175 } |
176 DEBUG_GENERAL("CallEngine end"); | 176 DEBUG_GENERAL("CallEngine end"); |
177 return true; | 177 return true; |
178 } | 178 } |
179 | 179 |
180 bool CAdblockPlusClient::CallEngine(Communication::ProcType proc, Communication:
:InputBuffer& inputBuffer) | 180 bool CAdblockPlusClient::CallEngine(Communication::ProcType proc, Communication:
:InputBuffer& inputBuffer) |
181 { | 181 { |
182 Communication::OutputBuffer message; | 182 Communication::OutputBuffer message; |
183 message << proc; | 183 message << proc; |
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
557 DEBUG_GENERAL("CompareVersions"); | 557 DEBUG_GENERAL("CompareVersions"); |
558 Communication::OutputBuffer request; | 558 Communication::OutputBuffer request; |
559 request << Communication::PROC_COMPARE_VERSIONS << ToUtf8String(v1) << ToUtf8S
tring(v2); | 559 request << Communication::PROC_COMPARE_VERSIONS << ToUtf8String(v1) << ToUtf8S
tring(v2); |
560 Communication::InputBuffer response; | 560 Communication::InputBuffer response; |
561 if (!CallEngine(request, response)) | 561 if (!CallEngine(request, response)) |
562 return 0; | 562 return 0; |
563 int result; | 563 int result; |
564 response >> result; | 564 response >> result; |
565 return result; | 565 return result; |
566 } | 566 } |
OLD | NEW |