aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2011-02-23 13:46:41 -0500
committerSteven Rostedt <rostedt@goodmis.org>2011-02-23 13:46:41 -0500
commite8ef70c16d94b2b47a7d2641012646b9fe271bd5 (patch)
treee1569e4a032f5c643fabf2e8ce4a320dec948a7d
parent6e7c1dd76377411dc89fdfd8e6320b1dd21aea71 (diff)
trace-cmd: Fix while() indentation in trace-record.c
Fix the while() loop indentation, which was only kept to help git see that the code was more of a move than any changes. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r--trace-record.c273
1 files changed, 137 insertions, 136 deletions
diff --git a/trace-record.c b/trace-record.c
index 139f632..0d6b38a 100644
--- a/trace-record.c
+++ b/trace-record.c
@@ -1574,6 +1574,7 @@ void trace_record (int argc, char **argv)
1574 int run_command = 0; 1574 int run_command = 0;
1575 int neg_event = 0; 1575 int neg_event = 0;
1576 int keep = 0; 1576 int keep = 0;
1577 int date = 0;
1577 int fset; 1578 int fset;
1578 int cpu; 1579 int cpu;
1579 1580
@@ -1605,148 +1606,148 @@ void trace_record (int argc, char **argv)
1605 } else 1606 } else
1606 usage(argv); 1607 usage(argv);
1607 1608
1608 while ((c = getopt(argc-1, argv+1, "+hae:f:Fp:cdo:O:s:r:vg:l:n:P:N:tb:ki")) >= 0) { 1609 while ((c = getopt(argc-1, argv+1, "+hae:f:Fp:cdo:O:s:r:vg:l:n:P:N:tb:ki")) >= 0) {
1609 switch (c) { 1610 switch (c) {
1610 case 'h': 1611 case 'h':
1612 usage(argv);
1613 break;
1614 case 'a':
1615 record_all = 1;
1616 while (listed_events) {
1617 list = listed_events;
1618 listed_events = list->next;
1619 free(list);
1620 }
1621 list = malloc_or_die(sizeof(*list));
1622 list->next = NULL;
1623 list->glob = "*/*";
1624 listed_events = list;
1625
1626 break;
1627 case 'e':
1628 if (extract)
1611 usage(argv); 1629 usage(argv);
1612 break; 1630 events = 1;
1613 case 'a': 1631 event = malloc_or_die(sizeof(*event));
1614 record_all = 1; 1632 memset(event, 0, sizeof(*event));
1615 while (listed_events) { 1633 event->event = optarg;
1616 list = listed_events; 1634 event->next = event_selection;
1617 listed_events = list->next; 1635 event->neg = neg_event;
1618 free(list); 1636 event_selection = event;
1619 } 1637 event->filter = NULL;
1638 last_event = event;
1639
1640 if (!record_all) {
1620 list = malloc_or_die(sizeof(*list)); 1641 list = malloc_or_die(sizeof(*list));
1621 list->next = NULL; 1642 list->next = listed_events;
1622 list->glob = "*/*"; 1643 list->glob = optarg;
1623 listed_events = list; 1644 listed_events = list;
1624 1645 }
1625 break;
1626 case 'e':
1627 if (extract)
1628 usage(argv);
1629 events = 1;
1630 event = malloc_or_die(sizeof(*event));
1631 memset(event, 0, sizeof(*event));
1632 event->event = optarg;
1633 event->next = event_selection;
1634 event->neg = neg_event;
1635 event_selection = event;
1636 event->filter = NULL;
1637 last_event = event;
1638
1639 if (!record_all) {
1640 list = malloc_or_die(sizeof(*list));
1641 list->next = listed_events;
1642 list->glob = optarg;
1643 listed_events = list;
1644 }
1645
1646 break;
1647 case 'f':
1648 if (!last_event)
1649 die("filter must come after event");
1650 if (last_event->filter) {
1651 last_event->filter =
1652 realloc(last_event->filter,
1653 strlen(last_event->filter) +
1654 strlen("&&()") +
1655 strlen(optarg) + 1);
1656 strcat(last_event->filter, "&&(");
1657 strcat(last_event->filter, optarg);
1658 strcat(last_event->filter, ")");
1659 } else {
1660 last_event->filter =
1661 malloc_or_die(strlen(optarg) +
1662 strlen("()") + 1);
1663 sprintf(last_event->filter, "(%s)", optarg);
1664 }
1665 break;
1666 1646
1667 case 'F': 1647 break;
1668 if (filter_pid >= 0) 1648 case 'f':
1669 die("-P and -F can not both be specified"); 1649 if (!last_event)
1670 filter_task = 1; 1650 die("filter must come after event");
1671 break; 1651 if (last_event->filter) {
1672 case 'P': 1652 last_event->filter =
1673 if (filter_task) 1653 realloc(last_event->filter,
1674 die("-P and -F can not both be specified"); 1654 strlen(last_event->filter) +
1675 if (filter_pid >= 0) 1655 strlen("&&()") +
1676 die("only one -P pid can be filtered at a time"); 1656 strlen(optarg) + 1);
1677 filter_pid = atoi(optarg); 1657 strcat(last_event->filter, "&&(");
1678 break; 1658 strcat(last_event->filter, optarg);
1679 case 'c': 1659 strcat(last_event->filter, ")");
1680 do_ptrace = 1; 1660 } else {
1681 break; 1661 last_event->filter =
1682 case 'v': 1662 malloc_or_die(strlen(optarg) +
1683 if (extract) 1663 strlen("()") + 1);
1684 usage(argv); 1664 sprintf(last_event->filter, "(%s)", optarg);
1685 neg_event = 1;
1686 break;
1687 case 'l':
1688 add_func(&filter_funcs, optarg);
1689 break;
1690 case 'n':
1691 add_func(&notrace_funcs, optarg);
1692 break;
1693 case 'g':
1694 add_func(&graph_funcs, optarg);
1695 break;
1696 case 'p':
1697 if (plugin)
1698 die("only one plugin allowed");
1699 plugin = optarg;
1700 fprintf(stderr, " plugin %s\n", plugin);
1701 break;
1702 case 'd':
1703 if (extract)
1704 usage(argv);
1705 disable = 1;
1706 break;
1707 case 'o':
1708 if (host)
1709 die("-o incompatible with -N");
1710 if (!record && !extract)
1711 die("start does not take output\n"
1712 "Did you mean 'record'?");
1713 if (output)
1714 die("only one output file allowed");
1715 output = optarg;
1716 break;
1717 case 'O':
1718 option = optarg;
1719 save_option(option);
1720 break;
1721 case 's':
1722 if (extract)
1723 usage(argv);
1724 sleep_time = atoi(optarg);
1725 break;
1726 case 'r':
1727 rt_prio = atoi(optarg);
1728 break;
1729 case 'N':
1730 if (!record)
1731 die("-N only available with record");
1732 if (output)
1733 die("-N incompatible with -o");
1734 host = optarg;
1735 break;
1736 case 't':
1737 use_tcp = 1;
1738 break;
1739 case 'b':
1740 buffer_size = atoi(optarg);
1741 break;
1742 case 'k':
1743 keep = 1;
1744 break;
1745 case 'i':
1746 ignore_event_not_found = 1;
1747 break;
1748 } 1665 }
1666 break;
1667
1668 case 'F':
1669 if (filter_pid >= 0)
1670 die("-P and -F can not both be specified");
1671 filter_task = 1;
1672 break;
1673 case 'P':
1674 if (filter_task)
1675 die("-P and -F can not both be specified");
1676 if (filter_pid >= 0)
1677 die("only one -P pid can be filtered at a time");
1678 filter_pid = atoi(optarg);
1679 break;
1680 case 'c':
1681 do_ptrace = 1;
1682 break;
1683 case 'v':
1684 if (extract)
1685 usage(argv);
1686 neg_event = 1;
1687 break;
1688 case 'l':
1689 add_func(&filter_funcs, optarg);
1690 break;
1691 case 'n':
1692 add_func(&notrace_funcs, optarg);
1693 break;
1694 case 'g':
1695 add_func(&graph_funcs, optarg);
1696 break;
1697 case 'p':
1698 if (plugin)
1699 die("only one plugin allowed");
1700 plugin = optarg;
1701 fprintf(stderr, " plugin %s\n", plugin);
1702 break;
1703 case 'd':
1704 if (extract)
1705 usage(argv);
1706 disable = 1;
1707 break;
1708 case 'o':
1709 if (host)
1710 die("-o incompatible with -N");
1711 if (!record && !extract)
1712 die("start does not take output\n"
1713 "Did you mean 'record'?");
1714 if (output)
1715 die("only one output file allowed");
1716 output = optarg;
1717 break;
1718 case 'O':
1719 option = optarg;
1720 save_option(option);
1721 break;
1722 case 's':
1723 if (extract)
1724 usage(argv);
1725 sleep_time = atoi(optarg);
1726 break;
1727 case 'r':
1728 rt_prio = atoi(optarg);
1729 break;
1730 case 'N':
1731 if (!record)
1732 die("-N only available with record");
1733 if (output)
1734 die("-N incompatible with -o");
1735 host = optarg;
1736 break;
1737 case 't':
1738 use_tcp = 1;
1739 break;
1740 case 'b':
1741 buffer_size = atoi(optarg);
1742 break;
1743 case 'k':
1744 keep = 1;
1745 break;
1746 case 'i':
1747 ignore_event_not_found = 1;
1748 break;
1749 } 1749 }
1750 }
1750 1751
1751 if (do_ptrace && !filter_task && (filter_pid < 0)) 1752 if (do_ptrace && !filter_task && (filter_pid < 0))
1752 die(" -c can only be used with -F or -P"); 1753 die(" -c can only be used with -F or -P");