Enabled overwrite processing on original transports.

* runtime/transport/relay_v2.c (_stp_transport_data_fs_overwrite): Renamed
  from stp_relay_set_overwrite().
* runtime/transport/relayfs.c (stp_relay_set_overwrite): Ditto.
* runtime/transport/ring_buffer.c (_stp_transport_data_fs_overwrite): New
  place holder function.
* runtime/transport/transport.c (_stp_detach): Calls
 _stp_transport_data_fs_overwrite().
  (_stp_attach): Calls _stp_transport_data_fs_overwrite().
* runtime/transport/transport.h: Added prototype for
  _stp_transport_data_fs_overwrite().

diff --git a/runtime/transport/relay_v2.c b/runtime/transport/relay_v2.c
index 246c4965de1c9757a82e5677fd7375c648b9789e..aa6f7b9970d2351f606495ca5fa0d8ef80510a73 100644 (file)
--- a/runtime/transport/relay_v2.c
+++ b/runtime/transport/relay_v2.c
@@ -147,7 +147,7 @@ static void __stp_relay_timer_init(void)
        smp_mb();
 }
 
-static void stp_relay_set_overwrite(int overwrite)
+static void _stp_transport_data_fs_overwrite(int overwrite)
 {
        _stp_relay_data.overwrite_flag = overwrite;
 }

diff --git a/runtime/transport/relayfs.c b/runtime/transport/relayfs.c
index 191b932f1f565ebd250c4774cbbe396f962838b8..c557efbc2dec75da1b3f2507596782085207ba53 100644 (file)
--- a/runtime/transport/relayfs.c
+++ b/runtime/transport/relayfs.c
@@ -136,7 +136,7 @@ err:
        return rc;
 }
 
-static void stp_relay_set_overwrite(int overwrite)
+static void _stp_transport_data_fs_overwrite(int overwrite)
 {
        _stp_relay_data.rchan->overwrite = overwrite;
 }

diff --git a/runtime/transport/ring_buffer.c b/runtime/transport/ring_buffer.c
index bed441e5500513bf442472d6a7adb0d5ed6e87c3..45ad8e2b8682333b967bdde7ad94c07dc4096b61 100644 (file)
--- a/runtime/transport/ring_buffer.c
+++ b/runtime/transport/ring_buffer.c
@@ -448,3 +448,7 @@ static void _stp_transport_data_fs_close(void)
        __stp_free_ring_buffer();
 }
 
+static void _stp_transport_data_fs_overwrite(int overwrite)
+{
+       /* FIXME: Just a place holder for now. */
+}

diff --git a/runtime/transport/transport.c b/runtime/transport/transport.c
index 84959f7169e63d1d627cececf01f5afb9ca77731..a1d90dcff82d7407562281f06b759ae0b2d7ec1e 100644 (file)
--- a/runtime/transport/transport.c
+++ b/runtime/transport/transport.c
@@ -20,13 +20,6 @@
 #include <linux/workqueue.h>
 #include <linux/delay.h>
 
-#if 0
-static void utt_set_overwrite(int overwrite)
-{
-       return;
-}
-#endif
-
 static int _stp_exit_flag = 0;
 
 static uid_t _stp_uid = 0;
@@ -166,10 +159,8 @@ static void _stp_detach(void)
        _stp_ctl_attached = 0;
        _stp_pid = 0;
 
-#if 0
        if (!_stp_exit_flag)
-               utt_set_overwrite(1);
-#endif
+               _stp_transport_data_fs_overwrite(1);
 
        cancel_delayed_work(&_stp_work);
        wake_up_interruptible(&_stp_ctl_wq);
@@ -183,9 +174,7 @@ static void _stp_attach(void)
        dbug_trans(1, "attach\n");
        _stp_ctl_attached = 1;
        _stp_pid = current->pid;
-#if 0
-       utt_set_overwrite(0);
-#endif
+       _stp_transport_data_fs_overwrite(0);
        queue_delayed_work(_stp_wq, &_stp_work, STP_WORK_TIMER);
 }
 

diff --git a/runtime/transport/transport.h b/runtime/transport/transport.h
index df2d496d14fc0d8cddc05e2cc59a15312267d581..b3d15ef3120e341df08492060187339918a494b6 100644 (file)
--- a/runtime/transport/transport.h
+++ b/runtime/transport/transport.h
@@ -11,19 +11,11 @@
 /* amount of data a print can send. */
 #define STP_BUFFER_SIZE 8192
 
-struct utt_trace;
-
 static int _stp_ctl_write(int type, void *data, unsigned len);
 
 static int _stp_transport_init(void);
 static void _stp_transport_close(void);
 
-static inline void *utt_reserve(struct utt_trace *utt, size_t length)
-{
-    return NULL;
-}
-
-
 /* STP_CTL_BUFFER_SIZE is the maximum size of a message */
 /* exchanged on the control channel. */
 #if STP_TRANSPORT_VERSION == 1
@@ -96,6 +88,15 @@ static void _stp_transport_data_fs_stop(void);
  */
 static void _stp_transport_data_fs_close(void);
 
+/*
+ * _stp_transport_data_fs_overwrite - set data overwrite mode
+ * overwrite:          boolean
+ *
+ * When in overwrite mode and the transport buffers are full, older
+ * data gets overwritten.
+ */
+static void _stp_transport_data_fs_overwrite(int overwrite);
+
 /*
  * _stp_data_write_reserve - reserve bytes
  * size_request:       number of bytes to reserve