Skip to content

Commit 5846980

Browse files
re2zerore2zero
committed
chore: More logs for base and service
Add more logs for base and service. 77.11% Log: More logs for base and service.
1 parent 55eaaa7 commit 5846980

27 files changed

Lines changed: 1555 additions & 207 deletions

‎basestruct/deviceinfo.cpp‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,32 @@
88
/*********************************** stCustest *********************************************/
99
QDBusArgument &operator<<(QDBusArgument &argument, const stCustest &stcus)
1010
{
11-
qDebug() << "Starting stCustest serialization";
11+
// qDebug() << "Starting stCustest serialization";
1212
argument.beginStructure();
1313
argument << stcus.m_length
1414
<< stcus.m_heads
1515
<< stcus.m_path;
1616
argument.endStructure();
17-
qDebug() << "Completed stCustest serialization";
17+
// qDebug() << "Completed stCustest serialization";
1818
return argument;
1919
}
2020

2121
const QDBusArgument &operator>>(const QDBusArgument &argument, stCustest &stcus)
2222
{
23+
// qDebug() << "Starting stCustest deserialization";
2324
argument.beginStructure();
2425
argument >> stcus.m_length
2526
>> stcus.m_heads
2627
>> stcus.m_path;
2728

2829
argument.endStructure();
30+
// qDebug() << "Completed stCustest deserialization";
2931
return argument;
3032
}
3133
/*********************************** HardDiskInfo *********************************************/
3234
QDBusArgument &operator<<(QDBusArgument &argument, const HardDiskInfo &inhdinfo)
3335
{
34-
qDebug() << "Starting HardDiskInfo serialization";
36+
// qDebug() << "Starting HardDiskInfo serialization";
3537
argument.beginStructure();
3638
argument << inhdinfo.m_model
3739
<< inhdinfo.m_vendor
@@ -48,12 +50,13 @@ QDBusArgument &operator<<(QDBusArgument &argument, const HardDiskInfo &inhdinfo)
4850
<< inhdinfo.m_firmwareVersion
4951
<< inhdinfo.m_speed;
5052
argument.endStructure();
51-
qDebug() << "Completed HardDiskInfo serialization";
53+
// qDebug() << "Completed HardDiskInfo serialization";
5254
return argument;
5355
}
5456

5557
const QDBusArgument &operator>>(const QDBusArgument &argument, HardDiskInfo &inhdinfo)
5658
{
59+
// qDebug() << "Starting HardDiskInfo deserialization";
5760
argument.beginStructure();
5861
argument >> inhdinfo.m_model
5962
>> inhdinfo.m_vendor
@@ -70,12 +73,13 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, HardDiskInfo &inh
7073
>> inhdinfo.m_firmwareVersion
7174
>> inhdinfo.m_speed;
7275
argument.endStructure();
76+
// qDebug() << "Completed HardDiskInfo deserialization";
7377
return argument;
7478
}
7579
/*********************************** HardDiskStatusInfo *********************************************/
7680
QDBusArgument &operator<<(QDBusArgument &argument, const HardDiskStatusInfo &inhdinfo)
7781
{
78-
qDebug() << "Starting HardDiskStatusInfo serialization";
82+
// qDebug() << "Starting HardDiskStatusInfo serialization";
7983
argument.beginStructure();
8084
argument << inhdinfo.m_id
8185
<< inhdinfo.m_attributeName
@@ -88,12 +92,12 @@ QDBusArgument &operator<<(QDBusArgument &argument, const HardDiskStatusInfo &inh
8892
<< inhdinfo.m_whenFailed
8993
<< inhdinfo.m_rawValue;
9094
argument.endStructure();
91-
qDebug() << "Completed HardDiskStatusInfo serialization";
95+
// qDebug() << "Completed HardDiskStatusInfo serialization";
9296
return argument;
9397
}
9498
const QDBusArgument &operator>>(const QDBusArgument &argument, HardDiskStatusInfo &inhdinfo)
9599
{
96-
qDebug() << "Starting HardDiskStatusInfo deserialization";
100+
// qDebug() << "Starting HardDiskStatusInfo deserialization";
97101
argument.beginStructure();
98102
argument >> inhdinfo.m_id
99103
>> inhdinfo.m_attributeName
@@ -107,12 +111,13 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, HardDiskStatusInf
107111
>> inhdinfo.m_rawValue;
108112
argument.endStructure();
109113

110-
qDebug() << "Completed HardDiskStatusInfo deserialization";
114+
// qDebug() << "Completed HardDiskStatusInfo deserialization";
111115
return argument;
112116
}
113117
/*********************************** DeviceInfo *********************************************/
114118
QDBusArgument &operator<<(QDBusArgument &argument, const DeviceInfo &info)
115119
{
120+
// qDebug() << "Starting DeviceInfo serialization";
116121
argument.beginStructure();
117122
argument << info.m_length
118123
<< info.m_heads
@@ -136,11 +141,13 @@ QDBusArgument &operator<<(QDBusArgument &argument, const DeviceInfo &info)
136141
<< static_cast<int>(info.m_luksFlag)
137142
<< info.m_crySupport;
138143
argument.endStructure();
144+
// qDebug() << "Completed DeviceInfo serialization";
139145
return argument;
140146
}
141147

142148
const QDBusArgument &operator>>(const QDBusArgument &argument, DeviceInfo &info)
143149
{
150+
// qDebug() << "Starting DeviceInfo deserialization";
144151
argument.beginStructure();
145152
int flag = 0;
146153
int flag2 = 0;
@@ -168,7 +175,7 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, DeviceInfo &info)
168175
info.m_vgFlag = static_cast<LVMFlag>(flag);
169176
info.m_luksFlag = static_cast<LUKSFlag>(flag2);
170177
argument.endStructure();
171-
qDebug() << "Completed DeviceInfo deserialization";
178+
// qDebug() << "Completed DeviceInfo deserialization";
172179
return argument;
173180
}
174181

@@ -187,7 +194,7 @@ DeviceInfo::DeviceInfo()
187194
/*********************************** WipeAction *********************************************/
188195
QDBusArgument &operator<<(QDBusArgument &argument, const WipeAction &data)
189196
{
190-
qDebug() << "Starting WipeAction serialization";
197+
// qDebug() << "Starting WipeAction serialization";
191198
argument.beginStructure();
192199
argument << data.m_fstype
193200
<< data.m_path
@@ -201,12 +208,13 @@ QDBusArgument &operator<<(QDBusArgument &argument, const WipeAction &data)
201208
<< data.m_decryptStr
202209
<< data.m_dmName;
203210
argument.endStructure();
211+
// qDebug() << "Completed WipeAction serialization";
204212
return argument;
205213
}
206214

207215
const QDBusArgument &operator>>(const QDBusArgument &argument, WipeAction &data)
208216
{
209-
qDebug() << "Starting WipeAction deserialization";
217+
// qDebug() << "Starting WipeAction deserialization";
210218
argument.beginStructure();
211219
int flag1, flag2;
212220
argument >> data.m_fstype
@@ -223,5 +231,6 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, WipeAction &data)
223231
data.m_luksFlag = static_cast<LUKSFlag>(flag1);
224232
data.m_crypt = static_cast<CRYPT_CIPHER>(flag2);
225233
argument.endStructure();
234+
// qDebug() << "Completed WipeAction deserialization";
226235
return argument;
227236
}

‎basestruct/luksstruct.cpp‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,32 +34,32 @@ bool CRYPT_CIPHER_Support::supportAllcrypt(CRYPT_CIPHER_Support::Support x)
3434

3535
QDBusArgument &operator<<(QDBusArgument &argument, const CRYPT_CIPHER_Support &data)
3636
{
37-
qDebug() << "Starting CRYPT_CIPHER_Support serialization";
37+
// qDebug() << "Starting CRYPT_CIPHER_Support serialization";
3838
argument.beginStructure();
3939
argument << static_cast<int>(data.aes_xts_plain64)
4040
<< static_cast<int>(data.sm4_xts_plain64);
4141
argument.endStructure();
42-
qDebug() << "Completed CRYPT_CIPHER_Support serialization";
42+
// qDebug() << "Completed CRYPT_CIPHER_Support serialization";
4343
return argument;
4444
}
4545

4646
const QDBusArgument &operator>>(const QDBusArgument &argument, CRYPT_CIPHER_Support &data)
4747
{
48-
qDebug() << "Starting CRYPT_CIPHER_Support deserialization";
48+
// qDebug() << "Starting CRYPT_CIPHER_Support deserialization";
4949
argument.beginStructure();
5050
int aes, sm4;
5151
argument >> aes
5252
>> sm4;
5353
data.aes_xts_plain64 = static_cast<CRYPT_CIPHER_Support::Support>(aes);
5454
data.sm4_xts_plain64 = static_cast<CRYPT_CIPHER_Support::Support>(sm4);
5555
argument.endStructure();
56-
qDebug() << "Completed CRYPT_CIPHER_Support deserialization";
56+
// qDebug() << "Completed CRYPT_CIPHER_Support deserialization";
5757
return argument;
5858
}
5959
/*********************************** LUKS_MapperInfo *********************************************/
6060
QDBusArgument &operator<<(QDBusArgument &argument, const LUKS_MapperInfo &data)
6161
{
62-
qDebug() << "Starting LUKS_MapperInfo serialization";
62+
// qDebug() << "Starting LUKS_MapperInfo serialization";
6363
argument.beginStructure();
6464
argument << static_cast<int>(data.m_luksFs)
6565
<< data.m_mountPoints
@@ -79,13 +79,13 @@ QDBusArgument &operator<<(QDBusArgument &argument, const LUKS_MapperInfo &data)
7979
<< data.m_fsLimits.min_size
8080
<< data.m_fileSystemLabel;
8181
argument.endStructure();
82-
qDebug() << "Completed LUKS_MapperInfo serialization";
82+
// qDebug() << "Completed LUKS_MapperInfo serialization";
8383
return argument;
8484
}
8585

8686
const QDBusArgument &operator>>(const QDBusArgument &argument, LUKS_MapperInfo &data)
8787
{
88-
qDebug() << "Starting LUKS_MapperInfo deserialization";
88+
// qDebug() << "Starting LUKS_MapperInfo deserialization";
8989
argument.beginStructure();
9090
int luksFlag, vgFlag, cipher;
9191
argument >> luksFlag
@@ -109,13 +109,13 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, LUKS_MapperInfo &
109109
data.m_vgflag = static_cast<LVMFlag>(vgFlag);
110110
data.m_crypt = static_cast<CRYPT_CIPHER>(cipher);
111111
argument.endStructure();
112-
qDebug() << "Completed LUKS_MapperInfo deserialization";
112+
// qDebug() << "Completed LUKS_MapperInfo deserialization";
113113
return argument;
114114
}
115115
/*********************************** LUKS_INFO *********************************************/
116116
QDBusArgument &operator<<(QDBusArgument &argument, const LUKS_INFO &data)
117117
{
118-
qDebug() << "Starting LUKS_INFO serialization";
118+
// qDebug() << "Starting LUKS_INFO serialization";
119119
argument.beginStructure();
120120
argument << data.m_mapper
121121
<< data.m_devicePath
@@ -132,13 +132,13 @@ QDBusArgument &operator<<(QDBusArgument &argument, const LUKS_INFO &data)
132132
<< data.m_Suspend
133133
<< data.m_fileSystemLabel;
134134
argument.endStructure();
135-
qDebug() << "Completed LUKS_INFO serialization";
135+
// qDebug() << "Completed LUKS_INFO serialization";
136136
return argument;
137137
}
138138

139139
const QDBusArgument &operator>>(const QDBusArgument &argument, LUKS_INFO &data)
140140
{
141-
qDebug() << "Starting LUKS_INFO deserialization";
141+
// qDebug() << "Starting LUKS_INFO deserialization";
142142
argument.beginStructure();
143143
int crypt, cryptErr;
144144
argument >> data.m_mapper
@@ -158,26 +158,26 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, LUKS_INFO &data)
158158
data.m_crypt = static_cast<CRYPT_CIPHER>(crypt);
159159
data.m_cryptErr = static_cast<CRYPTError>(cryptErr);
160160
argument.endStructure();
161-
qDebug() << "Completed LUKS_INFO deserialization";
161+
// qDebug() << "Completed LUKS_INFO deserialization";
162162
return argument;
163163
}
164164
/*********************************** LUKSMap ************************************************/
165165
QDBusArgument &operator<<(QDBusArgument &argument, const LUKSMap &data)
166166
{
167-
qDebug() << "Starting LUKSMap serialization";
167+
// qDebug() << "Starting LUKSMap serialization";
168168
argument.beginStructure();
169169
argument << data.m_luksMap
170170
<< data.m_mapper
171171
<< static_cast<int>(data.m_cryErr)
172172
<< data.m_cryptSuuport;
173173
argument.endStructure();
174-
qDebug() << "Completed LUKSMap serialization";
174+
// qDebug() << "Completed LUKSMap serialization";
175175
return argument;
176176
}
177177

178178
const QDBusArgument &operator>>(const QDBusArgument &argument, LUKSMap &data)
179179
{
180-
qDebug() << "Starting LUKSMap deserialization";
180+
// qDebug() << "Starting LUKSMap deserialization";
181181
argument.beginStructure();
182182
int cryptErr;
183183
argument >> data.m_luksMap
@@ -186,7 +186,7 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, LUKSMap &data)
186186
>> data.m_cryptSuuport;
187187
data.m_cryErr = static_cast<CRYPTError>(cryptErr);
188188
argument.endStructure();
189-
qDebug() << "Completed LUKSMap deserialization";
189+
// qDebug() << "Completed LUKSMap deserialization";
190190
return argument;
191191
}
192192

@@ -205,6 +205,7 @@ bool LUKSMap::mapperExists(const QString &path) const
205205

206206
foreach (const LUKS_MapperInfo &tmp, m_mapper) {
207207
if (tmp.m_dmPath == path) {
208+
// qDebug() << "Mapper found by dmPath for path:" << path;
208209
return true;
209210
}
210211
}
@@ -247,8 +248,10 @@ bool LUKSMap::deviceExists(const QString &dev) const
247248

248249
LUKS_MapperInfo LUKSMap::getMapper(const QString &path) const
249250
{
251+
// qDebug() << "Getting mapper for path:" << path;
250252
foreach (const LUKS_MapperInfo &tmp, m_mapper) {
251253
if (tmp.m_dmPath == path || tmp.m_devicePath == path) {
254+
qDebug() << "Mapper found for path:" << path;
252255
return tmp;
253256
}
254257
}
@@ -258,6 +261,7 @@ LUKS_MapperInfo LUKSMap::getMapper(const QString &path) const
258261

259262
LUKS_MapperInfo LUKSMap::getMapper(const LUKS_MapperInfo &mapper) const
260263
{
264+
// qDebug() << "Getting mapper for device path:" << mapper.m_devicePath;
261265
return getMapper(mapper.m_devicePath);
262266
}
263267

@@ -271,19 +275,22 @@ bool LUKSMap::luksExists(const QString &devPath) const
271275

272276
LUKS_INFO LUKSMap::getLUKS(const QString &path) const
273277
{
278+
// qDebug() << "Getting LUKS for path:" << path;
274279
QString devicePath = deviceExists(path) ? path : getDevPath(path);
275280
return getItem(devicePath, m_luksMap);
276281
}
277282

278283
template<class T>
279284
bool LUKSMap::itemExists(const QString &str, const QMap<QString, T> &containers)const
280285
{
286+
// qDebug() << "Checking existence of item:" << str;
281287
return containers.find(str) != containers.end();
282288
}
283289

284290
template<class T>
285291
T LUKSMap::getItem(const QString &str, const QMap<QString, T> &containers)const
286292
{
293+
// qDebug() << "Getting item:" << str;
287294
return itemExists(str, containers) ? *containers.find(str) : T();
288295
}
289296

0 commit comments

Comments
 (0)