git-svn-id: svn://db.shs.com.ru/libs@492 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
@@ -36,27 +36,22 @@ const uchar header_transfer = 0x81;
|
|||||||
|
|
||||||
__Core_Initializer__::__Core_Initializer__() {
|
__Core_Initializer__::__Core_Initializer__() {
|
||||||
count_++;
|
count_++;
|
||||||
piCout << "try create Core" << count_;
|
|
||||||
if (count_ > 1) return;
|
if (count_ > 1) return;
|
||||||
piCout << "create Core";
|
|
||||||
__instance__ = new CDCore();
|
__instance__ = new CDCore();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
__Core_Initializer__::~__Core_Initializer__() {
|
__Core_Initializer__::~__Core_Initializer__() {
|
||||||
count_--;
|
count_--;
|
||||||
piCout << "try delete Core" << count_;
|
|
||||||
if (count_ < 0) {
|
if (count_ < 0) {
|
||||||
count_ = 0;
|
count_ = 0;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (count_ > 0) return;
|
if (count_ > 0) return;
|
||||||
piCout << "delete Core ...";
|
|
||||||
if (__instance__) {
|
if (__instance__) {
|
||||||
delete __instance__;
|
delete __instance__;
|
||||||
__instance__ = 0;
|
__instance__ = 0;
|
||||||
}
|
}
|
||||||
piCout << "delete Core ok";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -99,17 +94,11 @@ CDCore::CDCore() {
|
|||||||
|
|
||||||
|
|
||||||
CDCore::~CDCore() {
|
CDCore::~CDCore() {
|
||||||
piCout << "~CDCore ...";
|
x_timer.stop(true);
|
||||||
x_timer.stop(false);
|
|
||||||
piCout << "~CDCore 1";
|
|
||||||
datatr.stop();
|
datatr.stop();
|
||||||
piCout << "~CDCore 2";
|
|
||||||
sendt.stop();
|
sendt.stop();
|
||||||
piCout << "~CDCore 3";
|
|
||||||
sendt.waitForFinish(10);
|
sendt.waitForFinish(10);
|
||||||
piCout << "~CDCore 4";
|
|
||||||
connection.stop();
|
connection.stop();
|
||||||
piCout << "~CDCore ok";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user