Changes in kernel/generic/src/udebug/udebug_ops.c [87a2f9b:6eef3c4] in mainline

File:

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

kernel/generic/src/udebug/udebug_ops.c

@@ -196 +196 @@
         /* Set udebug.active on all of the task's userspace threads. */
         
-        list_foreach(TASK->threads, th_link, thread_t, thread) {
+        list_foreach(TASK->threads, cur) {
+                thread_t *thread = list_get_instance(cur, thread_t, th_link);
+                
                 mutex_lock(&thread->udebug.lock);
                 if (thread->uspace) {
@@ -375 +377 @@
         if (TASK->udebug.dt_state != UDEBUG_TS_ACTIVE) {
                 mutex_unlock(&TASK->udebug.lock);
-                free(id_buffer);
                 return EINVAL;
         }
@@ -388 +389 @@
         
         /* FIXME: make sure the thread isn't past debug shutdown... */
-        list_foreach(TASK->threads, th_link, thread_t, thread) {
+        list_foreach(TASK->threads, cur) {
+                thread_t *thread = list_get_instance(cur, thread_t, th_link);
+                
                 irq_spinlock_lock(&thread->lock, false);
                 bool uspace = thread->uspace;
@@ -457 +460 @@
 int udebug_args_read(thread_t *thread, void **buffer)
 {
+        /* Prepare a buffer to hold the arguments. */
+        sysarg_t *arg_buffer = malloc(6 * sizeof(sysarg_t), 0);
+        
         /* On success, this will lock t->udebug.lock. */
         int rc = _thread_op_begin(thread, false);
@@ -469 +475 @@
         }
         
-        /* Prepare a buffer to hold the arguments. */
-        sysarg_t *arg_buffer = malloc(6 * sizeof(sysarg_t), 0);
-        
         /* Copy to a local buffer before releasing the lock. */
         memcpy(arg_buffer, thread->udebug.syscall_args, 6 * sizeof(sysarg_t));
@@ -500 +503 @@
 int udebug_regs_read(thread_t *thread, void **buffer)
 {
+        /* Prepare a buffer to hold the data. */
+        istate_t *state_buf = malloc(sizeof(istate_t), 0);
+        
         /* On success, this will lock t->udebug.lock */
         int rc = _thread_op_begin(thread, false);
@@ -510 +516 @@
                 return EBUSY;
         }
-        
-        /* Prepare a buffer to hold the data. */
-        istate_t *state_buf = malloc(sizeof(istate_t), 0);
         
         /* Copy to the allocated buffer */