1 files changed, 94 insertions, 31 deletions

diff --git a/runtime/print_new.c b/runtime/print_new.c
index fa7b4727..2d5a6e10 100644
--- a/runtime/print_new.c
+++ b/runtime/print_new.c
@@ -18,50 +18,113 @@
 
 static DEFINE_SPINLOCK(_stp_print_lock);
 
-void EXPORT_FN(stp_print_flush) (_stp_pbuf *pb)
+void EXPORT_FN(stp_print_flush)(_stp_pbuf *pb)
 {
-	uint32_t len = pb->len;
+	size_t len = pb->len;
+	void *entry = NULL;
 
 	/* check to see if there is anything in the buffer */
-	if (likely (len == 0))
+	dbug_trans(1, "len = %zu\n", len);
+	if (likely(len == 0))
 		return;
 
 	pb->len = 0;
 
-	if (unlikely(!_stp_utt || _stp_utt->trace_state != Utt_trace_running))
-		return;
+//DRS FIXME: this digs down too deep in internals
+//	if (unlikely(!_stp_utt || _stp_utt->trace_state != Utt_trace_running))
+//		return;
 
 #ifdef STP_BULKMODE
-	{
 #ifdef NO_PERCPU_HEADERS
-		void *buf = utt_reserve(_stp_utt, len);
-		if (likely(buf))
-			memcpy(buf, pb->buf, len);
-		else
-			atomic_inc (&_stp_transport_failures);
-#else
-		void *buf = utt_reserve(_stp_utt,
-					sizeof(struct _stp_trace) + len);
-		if (likely(buf)) {
-			struct _stp_trace t = {	.sequence = _stp_seq_inc(),
-						.pdu_len = len};
-			memcpy(buf, &t, sizeof(t)); // prevent unaligned access
-			memcpy(buf + sizeof(t), pb->buf, len);
-		} else 
-			atomic_inc (&_stp_transport_failures);
-#endif
-	} 
-#else
 	{
-		void *buf;
+		char *bufp = pb->buf;
+
+		while (len > 0) {
+			size_t bytes_reserved;
+
+			bytes_reserved = _stp_data_write_reserve(len, &entry);
+			if (likely(entry && bytes_reserved > 0)) {
+				memcpy(_stp_data_entry_data(entry), bufp,
+				       bytes_reserved);
+				_stp_data_write_commit(entry);
+				bufp += bytes_reserved;
+				len -= bytes_reserved;
+			}
+			else {
+				atomic_inc(&_stp_transport_failures);
+				break;
+			}
+		}
+	}
+
+#else  /* !NO_PERCPU_HEADERS */
+
+	{
+		char *bufp = pb->buf;
+		struct _stp_trace t = {	.sequence = _stp_seq_inc(),
+					.pdu_len = len};
+		size_t bytes_reserved;
+
+		bytes_reserved = _stp_data_write_reserve(sizeof(struct _stp_trace), &entry);
+		if (likely(entry && bytes_reserved > 0)) {
+			/* prevent unaligned access by using memcpy() */
+			memcpy(_stp_data_entry_data(entry), &t, sizeof(t));
+			_stp_data_write_commit(entry);
+		}
+		else {
+			atomic_inc(&_stp_transport_failures);
+			return;
+		}
+
+		while (len > 0) {
+			bytes_reserved = _stp_data_write_reserve(len, &entry);
+			if (likely(entry && bytes_reserved > 0)) {
+				memcpy(_stp_data_entry_data(entry), bufp,
+				       bytes_reserved);
+				_stp_data_write_commit(entry);
+				bufp += bytes_reserved;
+				len -= bytes_reserved;
+			}
+			else {
+				atomic_inc(&_stp_transport_failures);
+				break;
+			}
+		}
+	}
+#endif /* !NO_PERCPU_HEADERS */
+
+#else  /* !STP_BULKMODE */
+
+#if STP_TRANSPORT_VERSION == 1
+
+	if (unlikely(_stp_ctl_write(STP_REALTIME_DATA, pb->buf, len) <= 0))
+		atomic_inc (&_stp_transport_failures);
+
+#else  /* STP_TRANSPORT_VERSION != 1 */
+	{
 		unsigned long flags;
+		char *bufp = pb->buf;
+
+		dbug_trans(1, "calling _stp_data_write...\n");
 		spin_lock_irqsave(&_stp_print_lock, flags);
-		buf = utt_reserve(_stp_utt, len);
-		if (likely(buf))
-			memcpy(buf, pb->buf, len);
-		else
-			atomic_inc (&_stp_transport_failures);
+		while (len > 0) {
+			size_t bytes_reserved;
+
+			bytes_reserved = _stp_data_write_reserve(len, &entry);
+			if (likely(entry && bytes_reserved > 0)) {
+				memcpy(_stp_data_entry_data(entry), bufp,
+				       bytes_reserved);
+				_stp_data_write_commit(entry);
+				bufp += bytes_reserved;
+				len -= bytes_reserved;
+			}
+			else {
+			    atomic_inc(&_stp_transport_failures);
+			    break;
+			}
+		}
 		spin_unlock_irqrestore(&_stp_print_lock, flags);
 	}
-#endif /* STP_BULKMODE */
+#endif /* STP_TRANSPORT_VERSION != 1 */
+#endif /* !STP_BULKMODE */
 }