Skip to content

Commit d5ec844

Browse files
KaigeFuwenlingz
KaigeFu
authored and
wenlingz
committed
tools: acrn-manager: Replace pdebug with explicit err msg
pdebug just provide information about function name and source code line number. From debug point of view, it is better to give developer more detailed err msg. Tracked-On: #2716 Signed-off-by: Kaige Fu <kaige.fu@intel.com> Acked-by: Yan, Like <like.yan@intel.com>
1 parent 48774f7 commit d5ec844

File tree

4 files changed

+36
-44
lines changed

4 files changed

+36
-44
lines changed

‎tools/acrn-manager/acrn_mngr.c

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ static int check_dir(const char *path)
3434
if (S_ISDIR(st.st_mode))
3535
return 0;
3636

37-
pdebug();
3837
return -1;
3938
}
4039

@@ -95,13 +94,13 @@ static struct mngr_client *mngr_client_new(struct mngr_fd *mfd)
9594

9695
client = calloc(1, sizeof(*client));
9796
if (!client) {
98-
pdebug();
97+
printf("%s: Failed to alloc mem for client\n", __func__);
9998
goto alloc_client;
10099
}
101100

102101
client->buf = calloc(1, CLIENT_BUF_LEN);
103102
if (!client->buf) {
104-
pdebug();
103+
printf("%s: Failed to alloc mem for client buf\n", __func__);
105104
goto alloc_buf;
106105
}
107106

@@ -110,7 +109,7 @@ static struct mngr_client *mngr_client_new(struct mngr_fd *mfd)
110109
accept(mfd->fd, (struct sockaddr *)&client->addr,
111110
&client->addr_len);
112111
if (client->fd < 0) {
113-
pdebug();
112+
printf("%s: Failed to accept from fd %d, err: %s\n", __func__, mfd->fd, strerror(errno));
114113
goto accept_con;
115114
}
116115

@@ -190,7 +189,7 @@ static int server_parse_buf(struct mngr_fd *mfd, struct mngr_client *client)
190189

191190
/* do we out-of-boundary? */
192191
if (p + sizeof(struct mngr_msg) > client->len) {
193-
pdebug();
192+
printf("%s: Out of boundary, client len: %d, p: %lu\n", __func__, client->len, p);
194193
break;
195194
}
196195

@@ -318,7 +317,7 @@ static int create_new_server(const char *name)
318317
unlink(path);
319318
mfd->fd = socket(AF_UNIX, SOCK_STREAM, 0);
320319
if (mfd->fd < 0) {
321-
pdebug();
320+
printf("%s: Failed to call socket, err: %s\n", __func__, strerror(errno));
322321
ret = mfd->fd;
323322
goto sock_err;
324323
}
@@ -327,7 +326,7 @@ static int create_new_server(const char *name)
327326

328327
ret = bind(mfd->fd, (struct sockaddr *)&mfd->addr, sizeof(mfd->addr));
329328
if (ret < 0) {
330-
pdebug();
329+
printf("%s: Failed to bind fd %d, err: %s\n", __func__, mfd->fd, strerror(errno));
331330
goto bind_err;
332331
}
333332
listen(mfd->fd, 1);
@@ -337,7 +336,7 @@ static int create_new_server(const char *name)
337336
ret =
338337
pthread_create(&mfd->listen_thread, NULL, server_listen_func, mfd);
339338
if (ret < 0) {
340-
pdebug();
339+
printf("%s: Failed to create listen_thread, err: %s\n", __func__, strerror(errno));
341340
goto listen_err;
342341
}
343342
pthread_setname_np(mfd->listen_thread, "mngr_listen");
@@ -346,7 +345,7 @@ static int create_new_server(const char *name)
346345
mfd->polling = 1;
347346
ret = pthread_create(&mfd->poll_thread, NULL, server_poll_func, mfd);
348347
if (ret < 0) {
349-
pdebug();
348+
printf("%s: Failed to create poll_thread, err: %s\n", __func__, strerror(errno));
350349
goto poll_err;
351350
}
352351
pthread_setname_np(mfd->poll_thread, "mngr_pull");
@@ -415,7 +414,7 @@ static int connect_to_server(const char *name)
415414

416415
dir = opendir("/run/acrn/mngr");
417416
if (!dir) {
418-
pdebug();
417+
printf("%s: Failed to open directory /run/acrn/mngr\n", __func__);
419418
return -1;
420419
}
421420

@@ -433,7 +432,7 @@ static int connect_to_server(const char *name)
433432
}
434433

435434
if (!s_name) {
436-
pdebug();
435+
printf("%s: Can't find %s\n", __func__, name);
437436
closedir(dir);
438437
return -1;
439438
}
@@ -495,7 +494,7 @@ int mngr_open_un(const char *name, int flags)
495494
check_dir("/run/acrn/mngr");
496495

497496
if (!name) {
498-
pdebug();
497+
printf("%s: No socket name configured\n", __func__);
499498
return -1;
500499
}
501500

@@ -505,7 +504,7 @@ int mngr_open_un(const char *name, int flags)
505504
case MNGR_CLIENT:
506505
return connect_to_server(name);
507506
default:
508-
pdebug();
507+
printf("%s: Unknow flag %d\n", __func__, flags);
509508
}
510509

511510
return -1;
@@ -517,7 +516,7 @@ void mngr_close(int val)
517516

518517
mfd = desc_to_mfd(val);
519518
if (!mfd) {
520-
pdebug();
519+
printf("%s: No mngr_fd binded to fd %d\n", __func__, val);
521520
return;
522521
}
523522

@@ -533,7 +532,7 @@ void mngr_close(int val)
533532
close_client(mfd);
534533
break;
535534
default:
536-
pdebug();
535+
printf("%s: Unknown mfd type %d\n", __func__, mfd->type);
537536
}
538537

539538
}
@@ -547,13 +546,13 @@ int mngr_add_handler(int server_fd, unsigned id,
547546

548547
mfd = desc_to_mfd(server_fd);
549548
if (!mfd) {
550-
pdebug();
549+
printf("%s: No mngr_fd binded to fd %d\n", __func__, server_fd);
551550
return -1;
552551
}
553552

554553
handler = calloc(1, sizeof(*handler));
555554
if (!handler) {
556-
pdebug();
555+
printf("%s: Failed to alloc mem for handler\n", __func__);
557556
return -1;
558557
}
559558

‎tools/acrn-manager/acrn_mngr.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@
66
#ifndef ACRN_MANAGER_H
77
#define ACRN_MANAGER_H
88

9-
#ifdef MNGR_DEBUG
10-
#define pdebug() fprintf(stderr, "%s %d\n", __FUNCTION__, __LINE__)
11-
#else
12-
#define pdebug() while(0){}
13-
#endif
14-
159
#include <stdlib.h>
1610

1711
#define MNGR_MSG_MAGIC 0x67736d206d6d76 /* that is char[8] "mngr msg", on X86 */

‎tools/acrn-manager/acrn_vm_ops.c

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ static int query_state(const char *name)
7676

7777
ret = send_msg(name, &req, &ack);
7878
if (ret) {
79-
pdebug();
79+
printf("%s: Error to quary %s state, err: %d\n", __func__, name, ret);
8080
return ret;
8181
}
8282

@@ -133,13 +133,13 @@ static void _scan_alive_vm(void)
133133

134134
ret = check_dir(ACRN_DM_SOCK_PATH);
135135
if (ret) {
136-
pdebug();
136+
printf("%s: Failed to check directory %s, err: %d\n", __func__, ACRN_DM_SOCK_PATH, ret);
137137
return;
138138
}
139139

140140
dir = opendir(ACRN_DM_SOCK_PATH);
141141
if (!dir) {
142-
pdebug();
142+
printf("%s: Failed to open directory %s\n", __func__, ACRN_DM_SOCK_PATH);
143143
return;
144144
}
145145

@@ -150,17 +150,17 @@ static void _scan_alive_vm(void)
150150
continue;
151151

152152
if (name[sizeof(name) - 1]) {
153-
pdebug();
154153
/* truncate name and go a head */
155154
name[sizeof(name) - 1] = 0;
155+
printf("%s: Truncate name as %s\n", __func__, name);
156156
}
157157

158158
vm = vmmngr_find(name);
159159

160160
if (!vm) {
161161
vm = calloc(1, sizeof(*vm));
162162
if (!vm) {
163-
pdebug();
163+
printf("%s: Failed to alloc mem for %s\n", __func__, name);
164164
continue;
165165
}
166166
memcpy(vm->name, name, sizeof(vm->name) - 1);
@@ -207,9 +207,9 @@ static inline int _get_vmname_suffix(const char *src,
207207

208208
strncpy(name, src, p - src);
209209
if (p - src >= max_len_name) {
210-
pdebug();
211210
/* truncate name and go a head */
212211
name[max_len_name - 1] = '\0';
212+
printf("%s: Truncate name as %s\n", __func__, name);
213213
}
214214

215215
strncpy(suffix, p + 1, max_len_suffix);
@@ -230,26 +230,25 @@ static void _scan_added_vm(void)
230230

231231
ret = check_dir(ACRN_CONF_PATH);
232232
if (ret) {
233-
pdebug();
233+
printf("%s: Failed to check directory %s, err: %d\n", __func__, ACRN_CONF_PATH, ret);
234234
return;
235235
}
236236

237237
ret = check_dir(ACRN_CONF_PATH_ADD);
238238
if (ret) {
239-
pdebug();
239+
printf("%s: Failed to check directory %s, err: %d\n", __func__, ACRN_CONF_PATH_ADD, ret);
240240
return;
241241
}
242242

243243
dir = opendir(ACRN_CONF_PATH_ADD);
244244
if (!dir) {
245-
pdebug();
245+
printf("%s: Failed to open directory %s\n", __func__, ACRN_CONF_PATH_ADD);
246246
return;
247247
}
248248

249249
while ((entry = readdir(dir))) {
250250
ret = strnlen(entry->d_name, sizeof(entry->d_name));
251251
if (ret >= sizeof(name)) {
252-
pdebug();
253252
continue;
254253
}
255254

@@ -265,7 +264,7 @@ static void _scan_added_vm(void)
265264
if (!vm) {
266265
vm = calloc(1, sizeof(*vm));
267266
if (!vm) {
268-
pdebug();
267+
printf("%s: Failed to alloc mem for %s\n", __func__, name);
269268
continue;
270269
}
271270
memcpy(vm->name, name, sizeof(vm->name) - 1);
@@ -287,7 +286,7 @@ static void _remove_dead_vm(void)
287286
if (vm->update == update_count)
288287
continue;
289288
LIST_REMOVE(vm, list);
290-
pdebug();
289+
printf("%s: Removed dead %s\n", __func__, vm->name);
291290
free(vm);
292291
}
293292
};

‎tools/acrn-manager/acrnd.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ int acrnd_add_work(void (*func) (struct work_arg *arg),
5656
time_t current;
5757

5858
if (!func) {
59-
pdebug();
59+
printf("%s: No worker function configured\n", __func__);
6060
return -1;
6161
}
6262

@@ -124,14 +124,14 @@ void acrnd_vm_timer_func(struct work_arg *arg)
124124
struct vmmngr_struct *vm;
125125

126126
if (!arg) {
127-
pdebug();
127+
printf("%s: No work argument configured\n", __func__);
128128
return;
129129
}
130130

131131
vmmngr_update();
132132
vm = vmmngr_find(arg->name);
133133
if (!vm) {
134-
pdebug();
134+
printf("%s: Can't find %s\n", __func__, arg->name);
135135
return;
136136
}
137137

@@ -143,7 +143,7 @@ void acrnd_vm_timer_func(struct work_arg *arg)
143143
resume_vm(arg->name, CBC_WK_RSN_RTC);
144144
break;
145145
default:
146-
pdebug();
146+
printf("%s: Unknown vm state %ld\n", __func__, vm->state);
147147
}
148148
}
149149

@@ -259,7 +259,7 @@ static int active_all_vms(void)
259259
ret += resume_vm(vm->name, reason);
260260
break;
261261
default:
262-
pdebug();
262+
printf("%s: Unkown vm state %ld\n", __func__, vm->state);
263263
}
264264
}
265265

@@ -343,7 +343,7 @@ static void handle_timer_req(struct mngr_msg *msg, int client_fd, void *param)
343343
vmmngr_update();
344344
vm = vmmngr_find(msg->data.acrnd_timer.name);
345345
if (!vm) {
346-
pdebug();
346+
printf("%s: Can't find %s\n", __func__, msg->data.acrnd_timer.name);
347347
goto reply_ack;
348348
}
349349

@@ -354,7 +354,7 @@ static void handle_timer_req(struct mngr_msg *msg, int client_fd, void *param)
354354
}
355355

356356
if (acrnd_add_work(acrnd_vm_timer_func, &arg, msg->data.acrnd_timer.t)) {
357-
pdebug();
357+
printf("%s: Failed to add acrnd_vm_timer_func\n", __func__);
358358
goto reply_ack;
359359
}
360360

@@ -673,12 +673,12 @@ int main(int argc, char *argv[])
673673
/* create listening thread */
674674
acrnd_fd = mngr_open_un(ACRND_NAME, MNGR_SERVER);
675675
if (acrnd_fd < 0) {
676-
pdebug();
676+
printf("%s: Failed to open %s, err: %s\n", __func__, ACRND_NAME, strerror(errno));
677677
return -1;
678678
}
679679

680680
if (init_vm()) {
681-
pdebug();
681+
printf("%s: Failed to init_vm\n", __func__);
682682
return -1;
683683
}
684684

0 commit comments

Comments
 (0)