From 9e8281bc8ffdbb5555ee6082a3de0db421b092c0 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Wed, 14 Sep 2011 17:59:42 +0300 Subject: [PATCH] Initialize some fields via initializer lists in USER_IMPL and USER_PROPERTIES --- projects/stargazer/user_impl.cpp | 82 +++++++++++++++++----------- projects/stargazer/user_impl.h | 2 +- projects/stargazer/user_property.cpp | 76 +++++++++++++------------- 3 files changed, 89 insertions(+), 71 deletions(-) diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp index 547d18ed..6aca9cea 100644 --- a/projects/stargazer/user_impl.cpp +++ b/projects/stargazer/user_impl.cpp @@ -58,10 +58,12 @@ USER_IMPL::USER_IMPL(const SETTINGS * s, users(u), property(s->GetScriptsDir()), WriteServLog(GetStgLogger()), + lastScanMessages(0), login(), id(0), __connected(0), connected(__connected), + enabledDirs(), userIDGenerator(), __currIP(0), currIP(__currIP), @@ -71,6 +73,14 @@ USER_IMPL::USER_IMPL(const SETTINGS * s, store(st), tariffs(t), tariff(NULL), + traffStat(), + traffStatSaved(), + settings(s), + authorizedBy(), + messages(), + deleted(false), + lastWriteStat(0), + lastWriteDetailedStat(0), cash(property.cash), up(property.up), down(property.down), @@ -105,18 +115,18 @@ USER_IMPL::USER_IMPL(const SETTINGS * s, userdata7(property.userdata7), userdata8(property.userdata8), userdata9(property.userdata9), + sessionUpload(), + sessionDownload(), passiveNotifier(this), tariffNotifier(this), cashNotifier(this), - ipNotifier(this) + ipNotifier(this), + mutex(), + errorStr() { -settings = s; - password = "*_EMPTY_PASSWORD_*"; tariffName = NO_TARIFF_NAME; -connected = 0; ips = StrToIPS("*"); -deleted = false; lastWriteStat = stgTime + random() % settings->GetStatWritePeriod(); lastWriteDetailedStat = stgTime; @@ -125,8 +135,6 @@ property.passive.AddBeforeNotifier(&passiveNotifier); property.cash.AddBeforeNotifier(&cashNotifier); ips.AddAfterNotifier(&ipNotifier); -lastScanMessages = 0; - pthread_mutexattr_t attr; pthread_mutexattr_init(&attr); pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); @@ -134,18 +142,20 @@ pthread_mutex_init(&mutex, &attr); } #else USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s, - const STORE * st, - const TARIFFS * t, - const ADMIN * a, - const USERS * u) + const STORE * st, + const TARIFFS * t, + const ADMIN * a, + const USERS * u) : USER(), users(u), property(s->GetScriptsDir()), WriteServLog(GetStgLogger()), + lastScanMessages(0), login(), id(0), __connected(0), connected(__connected), + enabledDirs(), userIDGenerator(), __currIP(0), currIP(__currIP), @@ -155,6 +165,14 @@ USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s, store(st), tariffs(t), tariff(NULL), + traffStat(), + traffStatSaved(), + settings(s), + authorizedBy(), + messages(), + deleted(false), + lastWriteStat(0), + lastWriteDetailedStat(0), cash(property.cash), up(property.up), down(property.down), @@ -189,18 +207,18 @@ USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s, userdata7(property.userdata7), userdata8(property.userdata8), userdata9(property.userdata9), + sessionUpload(), + sessionDownload(), passiveNotifier(this), tariffNotifier(this), cashNotifier(this), - ipNotifier(this) + ipNotifier(this), + mutex(), + errorStr() { -settings = s; - password = "*_EMPTY_PASSWORD_*"; tariffName = NO_TARIFF_NAME; -connected = 0; ips = StrToIPS("*"); -deleted = false; lastWriteStat = stgTime + random() % settings->GetStatWritePeriod(); lastWriteDetailedStat = stgTime; @@ -209,8 +227,6 @@ property.passive.AddBeforeNotifier(&passiveNotifier); property.cash.AddBeforeNotifier(&cashNotifier); ips.AddAfterNotifier(&ipNotifier); -lastScanMessages = 0; - pthread_mutexattr_t attr; pthread_mutexattr_init(&attr); pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); @@ -223,10 +239,13 @@ USER_IMPL::USER_IMPL(const USER_IMPL & u) users(u.users), property(u.settings->GetScriptsDir()), WriteServLog(GetStgLogger()), + lastScanMessages(0), login(u.login), id(u.id), - __connected(u.__connected), + __connected(0), connected(__connected), + enabledDirs(), + userIDGenerator(u.userIDGenerator), __currIP(u.__currIP), currIP(__currIP), lastIPForDisconnect(0), @@ -235,6 +254,14 @@ USER_IMPL::USER_IMPL(const USER_IMPL & u) store(u.store), tariffs(u.tariffs), tariff(u.tariff), + traffStat(u.traffStat), + traffStatSaved(u.traffStatSaved), + settings(u.settings), + authorizedBy(), + messages(u.messages), + deleted(u.deleted), + lastWriteStat(u.lastWriteStat), + lastWriteDetailedStat(u.lastWriteDetailedStat), cash(property.cash), up(property.up), down(property.down), @@ -269,30 +296,23 @@ USER_IMPL::USER_IMPL(const USER_IMPL & u) userdata7(property.userdata7), userdata8(property.userdata8), userdata9(property.userdata9), + sessionUpload(), + sessionDownload(), passiveNotifier(this), tariffNotifier(this), cashNotifier(this), - ipNotifier(this) + ipNotifier(this), + mutex(), + errorStr() { if (&u == this) return; -connected = 0; - -deleted = u.deleted; - -lastWriteStat = u.lastWriteStat; -lastWriteDetailedStat = u.lastWriteDetailedStat; - -settings = u.settings; - property.tariffName.AddBeforeNotifier(&tariffNotifier); property.passive.AddBeforeNotifier(&passiveNotifier); property.cash.AddBeforeNotifier(&cashNotifier); ips.AddAfterNotifier(&ipNotifier); -lastScanMessages = 0; - property.SetProperties(u.property); pthread_mutexattr_t attr; diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h index 88506a2f..7aab735d 100644 --- a/projects/stargazer/user_impl.h +++ b/projects/stargazer/user_impl.h @@ -307,7 +307,7 @@ private: CHG_PASSIVE_NOTIFIER passiveNotifier; CHG_TARIFF_NOTIFIER tariffNotifier; CHG_CASH_NOTIFIER cashNotifier; - CHG_IPS_NOTIFIER ipNotifier; + CHG_IPS_NOTIFIER ipNotifier; mutable pthread_mutex_t mutex; diff --git a/projects/stargazer/user_property.cpp b/projects/stargazer/user_property.cpp index 06a4901a..5af05a46 100644 --- a/projects/stargazer/user_property.cpp +++ b/projects/stargazer/user_property.cpp @@ -1,44 +1,42 @@ #include "stg/user_property.h" -//----------------------------------------------------------------------------- USER_PROPERTIES::USER_PROPERTIES(const std::string & sd) -: -cash (stat.cash, "cash", false, true, GetStgLogger(), sd), -up (stat.up, "upload", false, true, GetStgLogger(), sd), -down (stat.down, "download", false, true, GetStgLogger(), sd), -lastCashAdd (stat.lastCashAdd, "lastCashAdd", false, true, GetStgLogger(), sd), -passiveTime (stat.passiveTime, "passiveTime", false, true, GetStgLogger(), sd), -lastCashAddTime (stat.lastCashAddTime, "lastCashAddTime", false, true, GetStgLogger(), sd), -freeMb (stat.freeMb, "freeMb", false, true, GetStgLogger(), sd), -lastActivityTime(stat.lastActivityTime, "lastActivityTime", false, true, GetStgLogger(), sd), + : stat(), + conf(), + cash (stat.cash, "cash", false, true, GetStgLogger(), sd), + up (stat.up, "upload", false, true, GetStgLogger(), sd), + down (stat.down, "download", false, true, GetStgLogger(), sd), + lastCashAdd (stat.lastCashAdd, "lastCashAdd", false, true, GetStgLogger(), sd), + passiveTime (stat.passiveTime, "passiveTime", false, true, GetStgLogger(), sd), + lastCashAddTime (stat.lastCashAddTime, "lastCashAddTime", false, true, GetStgLogger(), sd), + freeMb (stat.freeMb, "freeMb", false, true, GetStgLogger(), sd), + lastActivityTime(stat.lastActivityTime, "lastActivityTime", false, true, GetStgLogger(), sd), -password (conf.password, "password", true, false, GetStgLogger(), sd), -passive (conf.passive, "passive", false, false, GetStgLogger(), sd), -disabled (conf.disabled, "disabled", false, false, GetStgLogger(), sd), -disabledDetailStat(conf.disabledDetailStat, "DisabledDetailStat", false, false, GetStgLogger(), sd), -alwaysOnline(conf.alwaysOnline, "alwaysOnline", false, false, GetStgLogger(), sd), -tariffName (conf.tariffName, "tariff", false, false, GetStgLogger(), sd), -nextTariff (conf.nextTariff, "new tariff", false, false, GetStgLogger(), sd), -address (conf.address, "address", false, false, GetStgLogger(), sd), -note (conf.note, "note", false, false, GetStgLogger(), sd), -group (conf.group, "group", false, false, GetStgLogger(), sd), -email (conf.email, "email", false, false, GetStgLogger(), sd), -phone (conf.phone, "phone", false, false, GetStgLogger(), sd), -realName (conf.realName, "realName", false, false, GetStgLogger(), sd), -credit (conf.credit, "credit", false, false, GetStgLogger(), sd), -creditExpire(conf.creditExpire, "creditExpire", false, false, GetStgLogger(), sd), -ips (conf.ips, "IP", false, false, GetStgLogger(), sd), -userdata0 (conf.userdata[0], "userdata0", false, false, GetStgLogger(), sd), -userdata1 (conf.userdata[1], "userdata1", false, false, GetStgLogger(), sd), -userdata2 (conf.userdata[2], "userdata2", false, false, GetStgLogger(), sd), -userdata3 (conf.userdata[3], "userdata3", false, false, GetStgLogger(), sd), -userdata4 (conf.userdata[4], "userdata4", false, false, GetStgLogger(), sd), -userdata5 (conf.userdata[5], "userdata5", false, false, GetStgLogger(), sd), -userdata6 (conf.userdata[6], "userdata6", false, false, GetStgLogger(), sd), -userdata7 (conf.userdata[7], "userdata7", false, false, GetStgLogger(), sd), -userdata8 (conf.userdata[8], "userdata8", false, false, GetStgLogger(), sd), -userdata9 (conf.userdata[9], "userdata9", false, false, GetStgLogger(), sd) -{ -} -//----------------------------------------------------------------------------- + password (conf.password, "password", true, false, GetStgLogger(), sd), + passive (conf.passive, "passive", false, false, GetStgLogger(), sd), + disabled (conf.disabled, "disabled", false, false, GetStgLogger(), sd), + disabledDetailStat(conf.disabledDetailStat, "DisabledDetailStat", false, false, GetStgLogger(), sd), + alwaysOnline(conf.alwaysOnline, "alwaysOnline", false, false, GetStgLogger(), sd), + tariffName (conf.tariffName, "tariff", false, false, GetStgLogger(), sd), + nextTariff (conf.nextTariff, "new tariff", false, false, GetStgLogger(), sd), + address (conf.address, "address", false, false, GetStgLogger(), sd), + note (conf.note, "note", false, false, GetStgLogger(), sd), + group (conf.group, "group", false, false, GetStgLogger(), sd), + email (conf.email, "email", false, false, GetStgLogger(), sd), + phone (conf.phone, "phone", false, false, GetStgLogger(), sd), + realName (conf.realName, "realName", false, false, GetStgLogger(), sd), + credit (conf.credit, "credit", false, false, GetStgLogger(), sd), + creditExpire(conf.creditExpire, "creditExpire", false, false, GetStgLogger(), sd), + ips (conf.ips, "IP", false, false, GetStgLogger(), sd), + userdata0 (conf.userdata[0], "userdata0", false, false, GetStgLogger(), sd), + userdata1 (conf.userdata[1], "userdata1", false, false, GetStgLogger(), sd), + userdata2 (conf.userdata[2], "userdata2", false, false, GetStgLogger(), sd), + userdata3 (conf.userdata[3], "userdata3", false, false, GetStgLogger(), sd), + userdata4 (conf.userdata[4], "userdata4", false, false, GetStgLogger(), sd), + userdata5 (conf.userdata[5], "userdata5", false, false, GetStgLogger(), sd), + userdata6 (conf.userdata[6], "userdata6", false, false, GetStgLogger(), sd), + userdata7 (conf.userdata[7], "userdata7", false, false, GetStgLogger(), sd), + userdata8 (conf.userdata[8], "userdata8", false, false, GetStgLogger(), sd), + userdata9 (conf.userdata[9], "userdata9", false, false, GetStgLogger(), sd) +{} -- 2.44.2