Provide support for (Ada) task-specific breakpoints.

        * ada-lang.h (ada_get_task_number): Add declaration.
        (breakpoint_ada_task_match): Delete declaration.
        * ada-tasks.c (ada_get_task_number): Make non-static.
        * breakpoint.h (struct breakpoint): Add field "task".
        * breakpoint.c (print_one_breakpoint_location): Add handling of
        task-specific breakpoints.
        (create_breakpoint, create_breakpoints, find_condition_and_thread):
        New parameter "task".
        (break_command_really): Update calls to find_condition_and_thread
        and create_breakpoints.
        (breakpoint_re_set_one): Update call to find_condition_and_thread.
        Set b->task.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 046fd1969945b95d102f56a4c33783c494e7921f..ec689f5a8621d292795451efffe557d843fb885f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,20 @@
+2009-03-31  Joel Brobecker  <brobecker@adacore.com>
+
+       Provide support for (Ada) task-specific breakpoints.
+
+       * ada-lang.h (ada_get_task_number): Add declaration.
+       (breakpoint_ada_task_match): Delete declaration.
+       * ada-tasks.c (ada_get_task_number): Make non-static.
+       * breakpoint.h (struct breakpoint): Add field "task".
+       * breakpoint.c (print_one_breakpoint_location): Add handling of
+       task-specific breakpoints.
+       (create_breakpoint, create_breakpoints, find_condition_and_thread):
+       New parameter "task".
+       (break_command_really): Update calls to find_condition_and_thread
+       and create_breakpoints.
+       (breakpoint_re_set_one): Update call to find_condition_and_thread.
+       Set b->task.
+
 2009-03-31  Joel Brobecker  <brobecker@adacore.com>
 
        * ada-tasks.c (short_task_info): Eliminate the "Running" task state.

diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h
index 88b6c16cd47591dac581360c91789099766a9597..c9554a4dd32c3a6f7494fce6b63b1e0c8dc805c3 100644 (file)
--- a/gdb/ada-lang.h
+++ b/gdb/ada-lang.h
@@ -461,14 +461,14 @@ extern char *ada_main_name (void);
 
 extern int valid_task_id (int);
 
+extern int ada_get_task_number (ptid_t);
+
 extern void ada_adjust_exception_stop (bpstat bs);
 
 extern void ada_print_exception_stop (bpstat bs);
 
 extern int ada_get_current_task (ptid_t);
 
-extern int breakpoint_ada_task_match (CORE_ADDR, ptid_t);
-
 extern int ada_print_exception_breakpoint_nontask (struct breakpoint *);
 
 extern void ada_print_exception_breakpoint_task (struct breakpoint *);

diff --git a/gdb/ada-tasks.c b/gdb/ada-tasks.c
index 750449107e036e259ce31c28ba3e72c9cd9cdf12..f7bbf2dff909398919faa38c9e9aba6da3a6a561 100644 (file)
--- a/gdb/ada-tasks.c
+++ b/gdb/ada-tasks.c
@@ -160,7 +160,7 @@ static int stale_task_list_p = 1;
 /* Return the task number of the task whose ptid is PTID, or zero
    if the task could not be found.  */
 
-static int
+int
 ada_get_task_number (ptid_t ptid)
 {
   int i;

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index fa5cc3b62834105f538d62ce745b16f0d104cf60..cf0c5a1772b2a42057adb6ab4b0e722b55fa4b2b 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -1926,8 +1926,9 @@ int
 breakpoint_thread_match (CORE_ADDR pc, ptid_t ptid)
 {
   const struct bp_location *bpt;
-  /* The thread ID associated to PTID, computed lazily.  */
+  /* The thread and task IDs associated to PTID, computed lazily.  */
   int thread = -1;
+  int task = 0;
   
   ALL_BP_LOCATIONS (bpt)
     {
@@ -1953,6 +1954,17 @@ breakpoint_thread_match (CORE_ADDR pc, ptid_t ptid)
            continue;
        }
 
+      if (bpt->owner->task != 0)
+        {
+         /* This is a task-specific breakpoint.  Check that ptid
+            matches that task.  If task hasn't been computed yet,
+            it is now time to do so.  */
+         if (task == 0)
+           task = ada_get_task_number (ptid);
+         if (bpt->owner->task != task)
+           continue;
+        }
+
       if (overlay_debugging 
          && section_is_overlay (bpt->section) 
          && !section_is_mapped (bpt->section))
@@ -3610,12 +3622,20 @@ print_one_breakpoint_location (struct breakpoint *b,
        break;
       }
 
-  if (!part_of_multiple && b->thread != -1)
+  if (!part_of_multiple)
     {
-      /* FIXME: This seems to be redundant and lost here; see the
-        "stop only in" line a little further down. */
-      ui_out_text (uiout, " thread ");
-      ui_out_field_int (uiout, "thread", b->thread);
+      if (b->thread != -1)
+       {
+         /* FIXME: This seems to be redundant and lost here; see the
+            "stop only in" line a little further down. */
+         ui_out_text (uiout, " thread ");
+         ui_out_field_int (uiout, "thread", b->thread);
+       }
+      else if (b->task != 0)
+       {
+         ui_out_text (uiout, " task ");
+         ui_out_field_int (uiout, "task", b->task);
+       }
     }
   
   ui_out_text (uiout, "\n");
@@ -5213,7 +5233,7 @@ static void
 create_breakpoint (struct symtabs_and_lines sals, char *addr_string,
                   char *cond_string,
                   enum bptype type, enum bpdisp disposition,
-                  int thread, int ignore_count, 
+                  int thread, int task, int ignore_count, 
                   struct breakpoint_ops *ops, int from_tty, int enabled)
 {
   struct breakpoint *b = NULL;
@@ -5245,6 +5265,7 @@ create_breakpoint (struct symtabs_and_lines sals, char *addr_string,
          set_breakpoint_count (breakpoint_count + 1);
          b->number = breakpoint_count;
          b->thread = thread;
+         b->task = task;
   
          b->cond_string = cond_string;
          b->ignore_count = ignore_count;
@@ -5423,7 +5444,7 @@ static void
 create_breakpoints (struct symtabs_and_lines sals, char **addr_string,
                    char *cond_string,
                    enum bptype type, enum bpdisp disposition,
-                   int thread, int ignore_count, 
+                   int thread, int task, int ignore_count, 
                    struct breakpoint_ops *ops, int from_tty,
                    int enabled)
 {
@@ -5435,7 +5456,7 @@ create_breakpoints (struct symtabs_and_lines sals, char **addr_string,
 
       create_breakpoint (expanded, addr_string[i],
                         cond_string, type, disposition,
-                        thread, ignore_count, ops, from_tty, enabled);
+                        thread, task, ignore_count, ops, from_tty, enabled);
     }
 
   update_global_location_list (1);
@@ -5542,7 +5563,7 @@ do_captured_parse_breakpoint (struct ui_out *ui, void *data)
    If no thread is found, *THREAD is set to -1.  */
 static void 
 find_condition_and_thread (char *tok, CORE_ADDR pc, 
-                          char **cond_string, int *thread)
+                          char **cond_string, int *thread, int *task)
 {
   *cond_string = NULL;
   *thread = -1;
@@ -5585,6 +5606,18 @@ find_condition_and_thread (char *tok, CORE_ADDR pc,
          if (!valid_thread_id (*thread))
            error (_("Unknown thread %d."), *thread);
        }
+      else if (toklen >= 1 && strncmp (tok, "task", toklen) == 0)
+       {
+         char *tmptok;
+
+         tok = end_tok + 1;
+         tmptok = tok;
+         *task = strtol (tok, &tok, 0);
+         if (tok == tmptok)
+           error (_("Junk after task keyword."));
+         if (!valid_task_id (*task))
+           error (_("Unknown task %d\n"), *task);
+       }
       else
        error (_("Junk at end of arguments."));
     }
@@ -5624,6 +5657,7 @@ break_command_really (char *arg, char *cond_string, int thread,
   int pending = 0;
   int not_found = 0;
   enum bptype type_wanted;
+  int task = 0;
 
   sals.sals = NULL;
   sals.nelts = 0;
@@ -5729,7 +5763,8 @@ break_command_really (char *arg, char *cond_string, int thread,
                re-parse it in context of each sal.  */
             cond_string = NULL;
             thread = -1;
-            find_condition_and_thread (arg, sals.sals[0].pc, &cond_string, &thread);
+            find_condition_and_thread (arg, sals.sals[0].pc, &cond_string,
+                                       &thread, &task);
             if (cond_string)
                 make_cleanup (xfree, cond_string);
         }
@@ -5744,7 +5779,7 @@ break_command_really (char *arg, char *cond_string, int thread,
         }
       create_breakpoints (sals, addr_string, cond_string, type_wanted,
                          tempflag ? disp_del : disp_donttouch,
-                         thread, ignore_count, ops, from_tty, enabled);
+                         thread, task, ignore_count, ops, from_tty, enabled);
     }
   else
     {
@@ -7587,11 +7622,14 @@ breakpoint_re_set_one (void *bint)
        {
          char *cond_string = 0;
          int thread = -1;
+         int task = 0;
+
          find_condition_and_thread (s, sals.sals[0].pc, 
-                                    &cond_string, &thread);
+                                    &cond_string, &thread, &task);
          if (cond_string)
            b->cond_string = cond_string;
          b->thread = thread;
+         b->task = task;
          b->condition_not_parsed = 0;
        }
       expanded = expand_line_sal_maybe (sals.sals[0]);

diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 51aa7d1215504e809d51401730e43fd0dbe645b1..17b2761669918456a225ea78a3ee2960e31086c4 100644 (file)
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -425,9 +425,12 @@ struct breakpoint
        hardware.  */
     enum watchpoint_triggered watchpoint_triggered;
 
-    /* Thread number for thread-specific breakpoint, or -1 if don't care */
+    /* Thread number for thread-specific breakpoint, or -1 if don't care.  */
     int thread;
 
+    /* Ada task number for task-specific breakpoint, or 0 if don't care.  */
+    int task;
+
     /* Count of the number of times this breakpoint was taken, dumped
        with the info, but not used for anything else.  Useful for
        seeing how many times you hit a break prior to the program