Changeset d199a6f in mainline for uspace/srv/bd/hr/hr.c

Timestamp:

2024-11-15T21:32:20Z (6 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

7b359f5

Parents:

dfa2313

Message:

hr: DPRINTF, ERR_PRINTF → HR_DEBUG, HR_ERROR

Also add HR_WARN for warning level.

File:

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

uspace/srv/bd/hr/hr.c

@@ -62 +62 @@
 static hr_volume_t *hr_get_volume(service_id_t svc_id)
 {
-        DPRINTF("hr_get_volume(): (%" PRIun ")\n", svc_id);
+        HR_DEBUG("hr_get_volume(): (%" PRIun ")\n", svc_id);
 
         fibril_mutex_lock(&hr_volumes_lock);
@@ -78 +78 @@
 static errno_t hr_remove_volume(service_id_t svc_id)
 {
-        DPRINTF("hr_remove_volume(): (%" PRIun ")\n", svc_id);
+        HR_DEBUG("hr_remove_volume(): (%" PRIun ")\n", svc_id);
 
         fibril_mutex_lock(&hr_volumes_lock);
@@ -97 +97 @@
 static void hr_create_srv(ipc_call_t *icall, bool assemble)
 {
-        DPRINTF("hr_create_srv()\n");
+        HR_DEBUG("hr_create_srv()\n");
 
         errno_t rc;
@@ -139 +139 @@
                 for (i = 0; i < cfg->dev_no; i++) {
                         if (cfg->devs[i] == 0) {
-                                ERR_PRINTF("missing device provided for array "
+                                HR_ERROR("missing device provided for array "
                                     "creation, aborting");
                                 free(cfg);
@@ -163 +163 @@
         if (assemble) {
                 if (cfg->level != HR_LVL_UNKNOWN)
-                        log_msg(LOG_DEFAULT, LVL_WARN,
-                            "level manually set when assembling, ingoring");
+                        HR_WARN("level manually set when assembling, ingoring");
                 new_volume->level = HR_LVL_UNKNOWN;
         }
@@ -205 +204 @@
                 break;
         default:
-                ERR_PRINTF("unkown level: %d, aborting\n", new_volume->level);
+                HR_ERROR("unkown level: %d, aborting\n", new_volume->level);
                 rc = EINVAL;
                 goto error;
@@ -231 +230 @@
 
         if (assemble) {
-                DPRINTF("assembled volume \"%s\" (%" PRIun ")\n",
+                HR_DEBUG("assembled volume \"%s\" (%" PRIun ")\n",
                     new_volume->devname, new_volume->svc_id);
         } else {
-                DPRINTF("created volume \"%s\" (%" PRIun ")\n",
+                HR_DEBUG("created volume \"%s\" (%" PRIun ")\n",
                     new_volume->devname, new_volume->svc_id);
         }
@@ -250 +249 @@
 static void hr_stop_srv(ipc_call_t *icall)
 {
-        DPRINTF("hr_stop_srv()\n");
+        HR_DEBUG("hr_stop_srv()\n");
 
         errno_t rc = EOK;
@@ -284 +283 @@
 static void hr_print_status_srv(ipc_call_t *icall)
 {
-        DPRINTF("hr_status_srv()\n");
+        HR_DEBUG("hr_status_srv()\n");
 
         errno_t rc;
@@ -348 +347 @@
 static void hr_ctl_conn(ipc_call_t *icall, void *arg)
 {
-        DPRINTF("hr_ctl_conn()\n");
+        HR_DEBUG("hr_ctl_conn()\n");
 
         async_accept_0(icall);
@@ -383 +382 @@
 static void hr_client_conn(ipc_call_t *icall, void *arg)
 {
-        DPRINTF("hr_client_conn()\n");
+        HR_DEBUG("hr_client_conn()\n");
 
         hr_volume_t *vol;
@@ -392 +391 @@
                 hr_ctl_conn(icall, arg);
         } else {
-                DPRINTF("bd_conn()\n");
+                HR_DEBUG("bd_conn()\n");
                 vol = hr_get_volume(svc_id);
                 if (vol == NULL)
@@ -419 +418 @@
         rc = loc_server_register(NAME, &hr_srv);
         if (rc != EOK) {
-                ERR_PRINTF("failed registering server: %s", str_error(rc));
+                HR_ERROR("failed registering server: %s", str_error(rc));
                 return EEXIST;
         }
@@ -425 +424 @@
         rc = loc_service_register(hr_srv, SERVICE_NAME_HR, &ctl_sid);
         if (rc != EOK) {
-                ERR_PRINTF("failed registering service: %s", str_error(rc));
+                HR_ERROR("failed registering service: %s", str_error(rc));
                 return EEXIST;
         }