Changes in kernel/generic/src/udebug/udebug_ops.c [44a7ee5:a53ed3a] in mainline

File:

• kernel/generic/src/udebug/udebug_ops.c (modified) (24 diffs)

kernel/generic/src/udebug/udebug_ops.c

@@ -46 +46 @@
 #include <errno.h>
 #include <print.h>
+#include <stdbool.h>
 #include <str.h>
 #include <syscall/copy.h>
@@ -78 +79 @@
  *
  */
-static int _thread_op_begin(thread_t *thread, bool being_go)
+static errno_t _thread_op_begin(thread_t *thread, bool being_go)
 {
         mutex_lock(&TASK->udebug.lock);
@@ -157 +158 @@
  *
  * Initiates a debugging session for the current task (and its threads).
- * When the debugging session has started a reply will be sent to the
+ * When the debugging session has started a reply should be sent to the
  * UDEBUG_BEGIN call. This may happen immediately in this function if
  * all the threads in this task are stoppable at the moment and in this
- * case the function returns 1.
- *
- * Otherwise the function returns 0 and the reply will be sent as soon as
- * all the threads become stoppable (i.e. they can be considered stopped).
+ * case the function sets @a *active to @c true.
+ *
+ * Otherwise the function sets @a *active to false and the resonse should
+ * be sent as soon as all the threads become stoppable (i.e. they can be
+ * considered stopped).
  *
  * @param call The BEGIN call we are servicing.
- *
- * @return 0 (OK, but not done yet), 1 (done) or negative error code.
- *
- */
-int udebug_begin(call_t *call)
+ * @param active Place to store @c true iff we went directly to active state,
+ *               @c false if we only went to beginning state
+ *
+ * @return EOK on success, EBUSY if the task is already has an active
+ *         debugging session.
+ */
+errno_t udebug_begin(call_t *call, bool *active)
 {
         LOG("Debugging task %" PRIu64, TASK->taskid);
@@ -185 +189 @@
         TASK->udebug.debugger = call->sender;
         
-        int reply;
-        
         if (TASK->udebug.not_stoppable_count == 0) {
                 TASK->udebug.dt_state = UDEBUG_TS_ACTIVE;
                 TASK->udebug.begin_call = NULL;
-                reply = 1;  /* immediate reply */
+                *active = true;  /* directly to active state */
         } else
-                reply = 0;  /* no reply */
+                *active = false;  /* only in beginning state */
         
         /* Set udebug.active on all of the task's userspace threads. */
@@ -207 +209 @@
         
         mutex_unlock(&TASK->udebug.lock);
-        return reply;
+        return EOK;
 }
 
@@ -214 +216 @@
  * Closes the debugging session for the current task.
  *
- * @return Zero on success or negative error code.
- *
- */
-int udebug_end(void)
+ * @return Zero on success or an error code.
+ *
+ */
+errno_t udebug_end(void)
 {
         LOG("Task %" PRIu64, TASK->taskid);
         
         mutex_lock(&TASK->udebug.lock);
-        int rc = udebug_task_cleanup(TASK);
+        errno_t rc = udebug_task_cleanup(TASK);
         mutex_unlock(&TASK->udebug.lock);
         
@@ -234 +236 @@
  * @param mask Or combination of events that should be enabled.
  *
- * @return Zero on success or negative error code.
- *
- */
-int udebug_set_evmask(udebug_evmask_t mask)
+ * @return Zero on success or an error code.
+ *
+ */
+errno_t udebug_set_evmask(udebug_evmask_t mask)
 {
         LOG("mask = 0x%x", mask);
@@ -251 +253 @@
         mutex_unlock(&TASK->udebug.lock);
         
-        return 0;
+        return EOK;
 }
 
@@ -264 +266 @@
  *
  */
-int udebug_go(thread_t *thread, call_t *call)
+errno_t udebug_go(thread_t *thread, call_t *call)
 {
         /* On success, this will lock thread->udebug.lock. */
-        int rc = _thread_op_begin(thread, false);
+        errno_t rc = _thread_op_begin(thread, false);
         if (rc != EOK)
                 return rc;
@@ -283 +285 @@
         _thread_op_end(thread);
         
-        return 0;
+        return EOK;
 }
 
@@ -295 +297 @@
  *
  */
-int udebug_stop(thread_t *thread, call_t *call)
+errno_t udebug_stop(thread_t *thread, call_t *call)
 {
         LOG("udebug_stop()");
@@ -304 +306 @@
          *
          */
-        int rc = _thread_op_begin(thread, true);
+        errno_t rc = _thread_op_begin(thread, true);
         if (rc != EOK)
                 return rc;
@@ -314 +316 @@
                 /* Answer will be sent when the thread becomes stoppable. */
                 _thread_op_end(thread);
-                return 0;
+                return EOK;
         }
         
@@ -337 +339 @@
         mutex_unlock(&TASK->udebug.lock);
         
-        return 0;
+        return EOK;
 }
 
@@ -362 +364 @@
  *
  */
-int udebug_thread_read(void **buffer, size_t buf_size, size_t *stored,
+errno_t udebug_thread_read(void **buffer, size_t buf_size, size_t *stored,
     size_t *needed)
 {
@@ -412 +414 @@
         *needed = (copied_ids + extra_ids) * sizeof(sysarg_t);
         
-        return 0;
+        return EOK;
 }
 
@@ -426 +428 @@
  *
  */
-int udebug_name_read(char **data, size_t *data_size)
+errno_t udebug_name_read(char **data, size_t *data_size)
 {
         size_t name_size = str_size(TASK->name) + 1;
@@ -435 +437 @@
         memcpy(*data, TASK->name, name_size);
         
-        return 0;
+        return EOK;
 }
 
@@ -455 +457 @@
  *
  */
-int udebug_args_read(thread_t *thread, void **buffer)
+errno_t udebug_args_read(thread_t *thread, void **buffer)
 {
         /* On success, this will lock t->udebug.lock. */
-        int rc = _thread_op_begin(thread, false);
+        errno_t rc = _thread_op_begin(thread, false);
         if (rc != EOK)
                 return rc;
@@ -478 +480 @@
         
         *buffer = arg_buffer;
-        return 0;
+        return EOK;
 }
 
@@ -498 +500 @@
  *
  */
-int udebug_regs_read(thread_t *thread, void **buffer)
+errno_t udebug_regs_read(thread_t *thread, void **buffer)
 {
         /* On success, this will lock t->udebug.lock */
-        int rc = _thread_op_begin(thread, false);
+        errno_t rc = _thread_op_begin(thread, false);
         if (rc != EOK)
                 return rc;
@@ -520 +522 @@
         
         *buffer = (void *) state_buf;
-        return 0;
+        return EOK;
 }
 
@@ -534 +536 @@
  *
  */
-int udebug_mem_read(sysarg_t uspace_addr, size_t n, void **buffer)
+errno_t udebug_mem_read(sysarg_t uspace_addr, size_t n, void **buffer)
 {
         /* Verify task state */
@@ -551 +553 @@
          *
          */
-        int rc = copy_from_uspace(data_buffer, (void *) uspace_addr, n);
-        mutex_unlock(&TASK->udebug.lock);
-        
-        if (rc != 0)
+        errno_t rc = copy_from_uspace(data_buffer, (void *) uspace_addr, n);
+        mutex_unlock(&TASK->udebug.lock);
+        
+        if (rc != EOK)
                 return rc;
         
         *buffer = data_buffer;
-        return 0;
+        return EOK;
 }