Changeset 09dc6dc

Timestamp:

07/01/14 19:18:16 (7 years ago)

Author:

Richard Sanger <rsangerarj@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

0c866b0

Parents:

9b69b49

Message:

Print debug to stderr rather than stdout

File:

• lib/format_dpdk.c (modified) (10 diffs)

lib/format_dpdk.c

@@ -351 +351 @@
     if (global_config != NULL) {
         int i;
-        printf("Intel DPDK setup\n"
+        fprintf(stderr, "Intel DPDK setup\n"
                "---Version      : %"PRIu32"\n"
                "---Magic        : %"PRIu32"\n"
@@ -360 +360 @@
         
         for (i = 0 ; i < nb_cpu; i++) {
-            printf("   ---Core %d : %s\n", i, 
+            fprintf(stderr, "   ---Core %d : %s\n", i, 
                    global_config->lcore_role[i] == ROLE_RTE ? "on" : "off");
         }
@@ -381 +381 @@
                 proc_type = "something worse than invalid!!";
         }
-        printf("---Process Type : %s\n", proc_type);
+        fprintf(stderr, "---Process Type : %s\n", proc_type);
     }
     
@@ -744 +744 @@
          */
 #if DEBUG
-    printf("Creating mempool named %s\n", format_data->mempool_name);
+    fprintf(stderr, "Creating mempool named %s\n", format_data->mempool_name);
 #endif
         format_data->pktmbuf_pool =
@@ -825 +825 @@
     rte_eth_link_get(format_data->port, &link_info);
 #if DEBUG
-    printf("Link status is %d %d %d\n", (int) link_info.link_status,
+    fprintf(stderr, "Link status is %d %d %d\n", (int) link_info.link_status,
             (int) link_info.link_duplex, (int) link_info.link_speed);
 #endif
@@ -949 +949 @@
     ret = rte_eth_dev_start(format_data->port);
 #if DEBUG
-    printf("Done start device\n");
+    fprintf(stderr, "Done start device\n");
 #endif  
     if (ret < 0) {
@@ -979 +979 @@
     rte_eth_link_get(format_data->port, &link_info);
 #if DEBUG
-    printf("Link status is %d %d %d\n", (int) link_info.link_status,
+    fprintf(stderr, "Link status is %d %d %d\n", (int) link_info.link_status,
             (int) link_info.link_duplex, (int) link_info.link_speed);
 #endif
@@ -1015 +1015 @@
         tot = MIN(libtrace->perpkt_thread_count, enabled_lcore_count);
         tot = MIN(tot, 8);
-        printf("Running pstart DPDK %d %d %d %d\n", tot, libtrace->perpkt_thread_count, enabled_lcore_count, rte_lcore_count());
+        fprintf(stderr, "Running pstart DPDK %d %d %d %d\n", tot, libtrace->perpkt_thread_count, enabled_lcore_count, rte_lcore_count());
         
     if (dpdk_start_port_queues(libtrace, FORMAT(libtrace), err, sizeof(err), tot) != 0) {
@@ -1046 +1046 @@
     if (FORMAT(libtrace)->paused == DPDK_RUNNING) {
 #if DEBUG      
-        printf("Pausing port\n");
+        fprintf(stderr, "Pausing port\n");
 #endif
         rte_eth_dev_stop(FORMAT(libtrace)->port);
@@ -1431 +1431 @@
                             get_thread_table_num(libtrace), pkts_burst, 1);
         if (nb_rx > 0) { /* Got a packet - otherwise we keep spining */
-                        printf("Doing P READ PACKET port=%d q=%d\n", (int) FORMAT(libtrace)->port, (int) get_thread_table_num(libtrace));
+                        //fprintf(stderr, "Doing P READ PACKET port=%d q=%d\n", (int) FORMAT(libtrace)->port, (int) get_thread_table_num(libtrace));
             return dpdk_ready_pkt(libtrace, packet, pkts_burst[0]);
         }