Changeset d545d03 in mainline

Timestamp:

2012-01-12T08:38:13Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5923cf82

Parents:

8562724

Message:

remcons: unify log/error messages

Location:

uspace/srv/hid/remcons

Files:

• remcons.c (modified) (13 diffs)
• remcons.h (modified) (1 diff)
• user.h (modified) (1 diff)

uspace/srv/hid/remcons/remcons.c

@@ -193 +193 @@
 
                         if (rc != EOK) {
-                                printf("Problem sending data: %s\n", str_error(rc));
                                 async_answer_0(callid, rc);
                                 break;
@@ -242 +241 @@
         }
 
-        printf("New user for service %s.\n", user->service_name);
+        telnet_user_log(user, "New client connected (%" PRIxn").", iid);
 
         /* Accept the connection, increment reference. */
@@ -255 +254 @@
         /* Announce user disconnection. */
         telnet_user_notify_client_disconnected(user);
+        telnet_user_log(user, "Client disconnected (%" PRIxn").", iid);
 }
 
@@ -268 +268 @@
         rc = task_spawnl(&task, APP_GETTERM, APP_GETTERM, term, "/app/bdsh", NULL);
         if (rc != EOK) {
-                printf("%s: Error spawning %s -w %s %s (%s)\n", NAME,
+                telnet_user_error(user, "Spawning %s %s %s failed: %s.",
                     APP_GETTERM, term, "/app/bdsh", str_error(rc));
                 fibril_mutex_lock(&user->refcount_mutex);
@@ -284 +284 @@
         int task_retval;
         task_wait(task, &task_exit, &task_retval);
-        printf("%s: getterm terminated: %d, %d\n", NAME, task_exit, task_retval);
+        telnet_user_log(user, "%s terminated %s, exit code %d.", APP_GETTERM,
+            task_exit == TASK_EXIT_NORMAL ? "normally" : "unexpectedly",
+            task_retval);
 
         /* Announce destruction. */
@@ -308 +310 @@
         rc = loc_service_register(user->service_name, &user->service_id);
         if (rc != EOK) {
-                fprintf(stderr, "%s: Unable to register device %s\n", NAME,
-                    user->service_name);
+                telnet_user_error(user, "Unable to register %s with loc: %s.",
+                    user->service_name, str_error(rc));
                 return EOK;
         }
-        printf("Service %s registered as %" PRIun "\n", user->service_name,
-            user->service_id);
+
+        telnet_user_log(user, "Service %s registerd with id %" PRIun ".",
+            user->service_name, user->service_id);
 
         fid_t spawn_fibril = fibril_create(spawn_task_fibril, user);
@@ -337 +340 @@
         rc = loc_service_unregister(user->service_id);
         if (rc != EOK) {
-                fprintf(stderr, "Warning: failed to unregister %s: %s\n", user->service_name, str_error(rc));
-        }
-
-        printf("Destroying service %s.\n", user->service_name);
+                telnet_user_error(user,
+                    "Unable to unregister %s from loc: %s (ignored).",
+                    user->service_name, str_error(rc));
+        }
+
+        telnet_user_log(user, "Destroying...");
         telnet_user_destroy(user);
 
@@ -352 +357 @@
         int rc = loc_server_register(NAME, client_connection);
         if (rc < 0) {
-                printf("%s: Unable to register server (%s).\n", NAME,
+                fprintf(stderr, NAME ": Unable to register server: %s.\n",
                     str_error(rc));
                 return 1;
@@ -365 +370 @@
             &addr.sin_addr.s_addr);
         if (rc != EOK) {
-                fprintf(stderr, "Error parsing network address (%s)\n",
+                fprintf(stderr, "Error parsing network address: %s.\n",
                     str_error(rc));
                 return 2;
@@ -372 +377 @@
         int listen_sd = socket(PF_INET, SOCK_STREAM, 0);
         if (listen_sd < 0) {
-                fprintf(stderr, "Error creating listening socket (%s)\n",
+                fprintf(stderr, "Error creating listening socket: %s.\n",
                     str_error(listen_sd));
                 return 3;
@@ -379 +384 @@
         rc = bind(listen_sd, (struct sockaddr *) &addr, sizeof(addr));
         if (rc != EOK) {
-                fprintf(stderr, "Error binding socket (%s)\n",
+                fprintf(stderr, "Error binding socket: %s.\n",
                     str_error(rc));
                 return 4;
@@ -386 +391 @@
         rc = listen(listen_sd, BACKLOG_SIZE);
         if (rc != EOK) {
-                fprintf(stderr, "listen() failed (%s)\n", str_error(rc));
+                fprintf(stderr, "listen() failed: %s.\n", str_error(rc));
                 return 5;
         }
@@ -399 +404 @@
 
                 if (conn_sd < 0) {
-                        fprintf(stderr, "accept() failed (%s)\n", str_error(rc));
+                        fprintf(stderr, "accept() failed: %s.\n",
+                            str_error(rc));
                         continue;
                 }

uspace/srv/hid/remcons/remcons.h

@@ -36 +36 @@
 #define REMCONS_H_
 
-#define NAME       "remterm"
+#define NAME       "remcons"
 #define NAMESPACE  "term"
 #define BACKLOG_SIZE  5

uspace/srv/hid/remcons/user.h

@@ -69 +69 @@
 void telnet_user_notify_client_disconnected(telnet_user_t *user);
 
+#define telnet_user_log(user, fmt, ...) \
+        printf(NAME " [console %d (%d)]: " fmt "\n", user->id, (int) user->service_id, ##__VA_ARGS__)
+
+#define telnet_user_error(user, fmt, ...) \
+        fprintf(stderr, NAME " [console %d (%d)]: ERROR: " fmt "\n", user->id, (int) user->service_id, ##__VA_ARGS__)
+
 #endif