Changeset 5d96f427 in mainline for uspace/srv/bd/hr/hr.c

Timestamp:

2024-11-15T16:44:25Z (6 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

733564a

Parents:

bd51105

git-author:

Miroslav Cimerman <mc@…> (2024-11-15 16:08:11)

git-committer:

Miroslav Cimerman <mc@…> (2024-11-15 16:44:25)

Message:

hr: use DPRINTF and ERR_PRINTF macros from util.h

File:

• uspace/srv/bd/hr/hr.c (modified) (13 diffs)

uspace/srv/bd/hr/hr.c

@@ -62 +62 @@
 static hr_volume_t *hr_get_volume(service_id_t svc_id)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "hr_get_volume(): (%" PRIun ")",
-            svc_id);
+        DPRINTF("hr_get_volume(): (%" PRIun ")\n", svc_id);
 
         fibril_mutex_lock(&hr_volumes_lock);
@@ -79 +78 @@
 static errno_t hr_remove_volume(service_id_t svc_id)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "hr_remove_volume(): (%" PRIun ")",
-            svc_id);
+        DPRINTF("hr_remove_volume(): (%" PRIun ")\n", svc_id);
 
         fibril_mutex_lock(&hr_volumes_lock);
@@ -99 +97 @@
 static void hr_create_srv(ipc_call_t *icall, bool assemble)
 {
-        log_msg(LOG_DEFAULT, LVL_NOTE, "hr_create_srv()");
+        DPRINTF("hr_create_srv()\n");
 
         errno_t rc;
@@ -141 +139 @@
                 for (i = 0; i < cfg->dev_no; i++) {
                         if (cfg->devs[i] == 0) {
+                                ERR_PRINTF("missing device provided for array "
+                                    "creation, aborting");
                                 free(cfg);
                                 async_answer_0(icall, EINVAL);
@@ -205 +205 @@
                 break;
         default:
-                log_msg(LOG_DEFAULT, LVL_ERROR,
-                    "level %d not implemented yet", new_volume->level);
+                ERR_PRINTF("unkown level: %d, aborting\n", new_volume->level);
                 rc = EINVAL;
                 goto error;
@@ -232 +231 @@
 
         if (assemble) {
-                log_msg(LOG_DEFAULT, LVL_NOTE,
-                    "assembled volume \"%s\" (%" PRIun ")",
+                DPRINTF("assembled volume \"%s\" (%" PRIun ")\n",
                     new_volume->devname, new_volume->svc_id);
         } else {
-                log_msg(LOG_DEFAULT, LVL_NOTE,
-                    "created volume \"%s\" (%" PRIun ")",
+                DPRINTF("created volume \"%s\" (%" PRIun ")\n",
                     new_volume->devname, new_volume->svc_id);
         }
@@ -253 +250 @@
 static void hr_stop_srv(ipc_call_t *icall)
 {
-        log_msg(LOG_DEFAULT, LVL_NOTE, "hr_stop_srv()");
+        DPRINTF("hr_stop_srv()\n");
 
         errno_t rc = EOK;
@@ -287 +284 @@
 static void hr_print_status_srv(ipc_call_t *icall)
 {
-        log_msg(LOG_DEFAULT, LVL_NOTE, "hr_status_srv()");
+        DPRINTF("hr_status_srv()\n");
 
         errno_t rc;
@@ -351 +348 @@
 static void hr_ctl_conn(ipc_call_t *icall, void *arg)
 {
-        log_msg(LOG_DEFAULT, LVL_NOTE, "hr_ctl_conn()");
+        DPRINTF("hr_ctl_conn()\n");
 
         async_accept_0(icall);
@@ -386 +383 @@
 static void hr_client_conn(ipc_call_t *icall, void *arg)
 {
-        log_msg(LOG_DEFAULT, LVL_NOTE, "hr_client_conn()");
+        DPRINTF("hr_client_conn()\n");
 
         hr_volume_t *vol;
@@ -395 +392 @@
                 hr_ctl_conn(icall, arg);
         } else {
-                log_msg(LOG_DEFAULT, LVL_NOTE, "bd_conn()");
+                DPRINTF("bd_conn()\n");
                 vol = hr_get_volume(svc_id);
                 if (vol == NULL)
@@ -422 +419 @@
         rc = loc_server_register(NAME, &hr_srv);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR,
-                    "failed registering server: %s", str_error(rc));
+                ERR_PRINTF("failed registering server: %s", str_error(rc));
                 return EEXIST;
         }
@@ -429 +425 @@
         rc = loc_service_register(hr_srv, SERVICE_NAME_HR, &ctl_sid);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR,
-                    "failed registering service: %s", str_error(rc));
+                ERR_PRINTF("failed registering service: %s", str_error(rc));
                 return EEXIST;
         }