Merge commit 'origin/master' into pr7043

Conflicts:
	runtime/print.c
	runtime/transport/transport.c
	runtime/transport/transport_msgs.h

diff --cc runtime/print.c
index c1fff306b9cd16d5b07de8bb18d236cc8694e022,964a73c20255f0f1cd0b05e88546ef8c975b4990..d51c81080b936e7e875a1c0f33eb4559d44a4494
--- 1/runtime/print.c
--- 2/runtime/print.c
+++ b/runtime/print.c
@@@ -13,9 -13,8 +13,10 @@@
  
  
  #include "string.h"
 +#include "vsprintf.c"
 +#include "print.h"
  #include "transport/transport.c"
+ #include "vsprintf.c"
  
  /** @file print.c
   * Printing Functions.

diff --cc runtime/runtime.h
Simple merge

diff --cc runtime/staprun/mainloop.c
index 0745f611b387bd2c13f30db3ea90763ff0848c3b,205fdf37c686e0068e01871dc3c7cb3173a28ad9..7125a7bbd944e8d8d307e1c233316b814ec0eb30
--- 1/runtime/staprun/mainloop.c
--- 2/runtime/staprun/mainloop.c
+++ b/runtime/staprun/mainloop.c
@@@ -452,23 -487,16 +487,16 @@@ int stp_main_loop(void
      nb -= sizeof(uint32_t);
  
      switch (type) {
 -#ifdef STP_OLD_TRANSPORT
 +#if STP_TRANSPORT_VERSION == 1
      case STP_REALTIME_DATA:
-       {
-         ssize_t bw = write(out_fd[0], data, nb);
-         if (bw >= 0 && bw != nb) {
-           nb = nb - bw;
-           bw = write(out_fd[0], data, nb);
-         }
-         if (bw != nb) {
-           _perr("write error (nb=%ld)", (long)nb);
-           cleanup_and_exit(0);
-         }
-         break;
+       if (write_realtime_data(data, nb)) {
+         _perr("write error (nb=%ld)", (long)nb);
+         cleanup_and_exit(0);
        }
+       break;
  #endif
      case STP_OOB_DATA:
-       fputs((char *)data, stderr);
+       eprintf("%s", (char *)data);
        break;
      case STP_EXIT:
        {

diff --cc runtime/staprun/staprun.h
Simple merge

diff --cc runtime/sym.c
index 31700326804a6946d0c170997a3f26949ed2369a,63dad1af67811ad052651be3b393c3f6acb8f268..386005b2e9d69f289fb0e2ca50ed0aabd315e0eb
--- 1/runtime/sym.c
--- 2/runtime/sym.c
+++ b/runtime/sym.c
@@@ -12,8 -12,8 +12,9 @@@
  #ifndef _STP_SYM_C_
  #define _STP_SYM_C_
  
 +#include "sym.h"
  #include "string.c"
+ #include "task_finder_vma.c"
  
  /** @file sym.c
   * @addtogroup sym Symbolic Functions

diff --cc runtime/transport/control.c
Simple merge

diff --cc runtime/transport/transport.c
index 3d0453bf13c55c1b5fd9757a8d29568b4edf30d6,762c0a92cb704d59981d8150491a93f3d853dc5b..792ea815e81d5ad9867d1dcf6fc374261feb5d5c
--- 1/runtime/transport/transport.c
--- 2/runtime/transport/transport.c
+++ b/runtime/transport/transport.c
@@@ -202,8 -181,8 +214,8 @@@ static void _stp_work_queue(void *data
  
        /* if exit flag is set AND we have finished with probe_start() */
        if (unlikely(_stp_exit_flag && _stp_probes_started))
-               _stp_cleanup_and_exit(1);
+               _stp_request_exit();
 -      if (likely(_stp_attached))
 +      if (likely(_stp_ctl_attached))
                queue_delayed_work(_stp_wq, &_stp_work, STP_WORK_TIMER);
  }
  

diff --cc runtime/transport/transport_msgs.h
index 0d6853f7b7d0875ffbb075637d309f2eefa6e4fd,0d9a598367612d240689c8d2cf589bd02d9d4a88..aa50051c89581335d53d56cc478b6996f888fabb
--- 1/runtime/transport/transport_msgs.h
--- 2/runtime/transport/transport_msgs.h
+++ b/runtime/transport/transport_msgs.h
@@@ -26,11 -26,11 +26,11 @@@ enu
        STP_SYSTEM,
        STP_TRANSPORT,
        STP_CONNECT,
-       STP_DISCONNECT,
+       STP_DISCONNECT,
        STP_BULK,
        STP_READY,
 -      STP_RELOCATION,
 -      /** deprecated STP_OLD_TRANSPORT **/
 +        STP_RELOCATION,
 +      /** deprecated STP_TRANSPORT_VERSION == 1 **/
        STP_BUF_INFO,
        STP_SUBBUFS_CONSUMED,
        STP_REALTIME_DATA,

diff --cc testsuite/systemtap.printf/end1.exp
Simple merge

diff --cc testsuite/systemtap.printf/end1b.exp
Simple merge

diff --cc testsuite/systemtap.printf/mixed_out.exp
Simple merge

diff --cc testsuite/systemtap.printf/mixed_outb.exp
Simple merge

diff --cc testsuite/systemtap.printf/out1.exp
Simple merge

diff --cc testsuite/systemtap.printf/out1b.exp
Simple merge

diff --cc testsuite/systemtap.printf/out2.exp
Simple merge

diff --cc testsuite/systemtap.printf/out2b.exp
Simple merge

diff --cc testsuite/systemtap.printf/out3.exp
Simple merge

diff --cc testsuite/systemtap.printf/out3b.exp
Simple merge