summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
Diffstat (limited to 'runtime')
-rw-r--r--runtime/print_new.c132
-rw-r--r--runtime/transport/ring_buffer.c34
-rw-r--r--runtime/transport/transport.h3
3 files changed, 64 insertions, 105 deletions
diff --git a/runtime/print_new.c b/runtime/print_new.c
index 01bbe809..86c44ea7 100644
--- a/runtime/print_new.c
+++ b/runtime/print_new.c
@@ -18,14 +18,14 @@
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;
- struct _stp_entry *entry;
+ size_t len = pb->len;
+ struct _stp_entry *entry = NULL;
/* check to see if there is anything in the buffer */
- dbug_trans(1, "len = %ud\n", len);
- if (likely (len == 0))
+ dbug_trans(1, "len = %zu\n", len);
+ if (likely(len == 0))
return;
pb->len = 0;
@@ -34,35 +34,23 @@ void EXPORT_FN(stp_print_flush) (_stp_pbuf *pb)
// if (unlikely(!_stp_utt || _stp_utt->trace_state != Utt_trace_running))
// return;
-#define MAX_RESERVE_SIZE (4080 /*BUF_PAGE_SIZE*/ - sizeof(struct _stp_entry) - 10)
#ifdef STP_BULKMODE
#ifdef NO_PERCPU_HEADERS
{
- uint32_t cnt;
char *bufp = pb->buf;
- printk(KERN_ERR "%s:%d - flushing %d(%d) bytes\n",
- __FUNCTION__, __LINE__, pb->len, len);
while (len > 0) {
- if (len > MAX_RESERVE_SIZE) {
- len -= MAX_RESERVE_SIZE;
- cnt = MAX_RESERVE_SIZE;
- }
- else {
- cnt = len;
- len = 0;
- }
+ size_t bytes_reserved;
- printk(KERN_ERR "%s:%d - reserving %d bytes\n",
- __FUNCTION__, __LINE__, cnt);
- entry = _stp_data_write_reserve(cnt);
- if (likely(entry)) {
- memcpy(entry->buf, bufp, cnt);
+ bytes_reserved = _stp_data_write_reserve(len, &entry);
+ if (likely(entry && bytes_reserved > 0)) {
+ memcpy(entry->buf, bufp, bytes_reserved);
_stp_data_write_commit(entry);
- bufp += cnt;
+ bufp += bytes_reserved;
+ len -= bytes_reserved;
}
else {
- atomic_inc (&_stp_transport_failures);
+ atomic_inc(&_stp_transport_failures);
break;
}
}
@@ -70,104 +58,58 @@ void EXPORT_FN(stp_print_flush) (_stp_pbuf *pb)
#else /* !NO_PERCPU_HEADERS */
-#undef MAX_RESERVE_SIZE
-#define MAX_RESERVE_SIZE (4080 /*BUF_PAGE_SIZE*/ - sizeof(struct _stp_entry) - 10 - sizeof(struct _stp_trace))
{
- uint32_t cnt;
char *bufp = pb->buf;
struct _stp_trace t = { .sequence = _stp_seq_inc(),
.pdu_len = len};
+ size_t bytes_reserved;
- printk(KERN_ERR "%s:%d - flushing %d(%d) bytes\n",
- __FUNCTION__, __LINE__, pb->len, len);
-
- entry = _stp_data_write_reserve(sizeof(struct _stp_trace));
- if (likely(entry)) {
+ bytes_reserved = _stp_data_write_reserve(sizeof(struct _stp_trace), &entry);
+ if (likely(entry && bytes_reserved > 0)) {
/* prevent unaligned access by using memcpy() */
memcpy(entry->buf, &t, sizeof(t));
_stp_data_write_commit(entry);
}
else {
- atomic_inc (&_stp_transport_failures);
+ atomic_inc(&_stp_transport_failures);
return;
}
while (len > 0) {
- if (len > MAX_RESERVE_SIZE) {
- len -= MAX_RESERVE_SIZE;
- cnt = MAX_RESERVE_SIZE;
- }
- else {
- cnt = len;
- len = 0;
- }
-
- printk(KERN_ERR "%s:%d - reserving %d bytes\n",
- __FUNCTION__, __LINE__, cnt);
- entry = _stp_data_write_reserve(cnt);
- if (likely(entry)) {
- memcpy(entry->buf, bufp, cnt);
+ bytes_reserved = _stp_data_write_reserve(len, &entry);
+ if (likely(entry && bytes_reserved > 0)) {
+ memcpy(entry->buf, bufp, bytes_reserved);
_stp_data_write_commit(entry);
- bufp += cnt;
+ bufp += bytes_reserved;
+ len -= bytes_reserved;
}
else {
- atomic_inc (&_stp_transport_failures);
+ atomic_inc(&_stp_transport_failures);
break;
}
}
}
-
-
-
-
-#if 0
- /* original code */
- 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
-
-#endif /* !NO_PERCPU_HEADERS */
-#else /* !STP_BULKMODE */
+#endif /* !NO_PERCPU_HEADERS */
+#else /* !STP_BULKMODE */
{
unsigned long flags;
+ char *bufp = pb->buf;
dbug_trans(1, "calling _stp_data_write...\n");
spin_lock_irqsave(&_stp_print_lock, flags);
- {
- uint32_t cnt;
- char *bufp = pb->buf;
-
- printk(KERN_ERR "%s:%d - flushing %d(%d) bytes\n",
- __FUNCTION__, __LINE__, pb->len, len);
- while (len > 0) {
- if (len > MAX_RESERVE_SIZE) {
- len -= MAX_RESERVE_SIZE;
- cnt = MAX_RESERVE_SIZE;
- }
- else {
- cnt = len;
- len = 0;
- }
+ while (len > 0) {
+ size_t bytes_reserved;
- printk(KERN_ERR "%s:%d - reserving %d bytes\n",
- __FUNCTION__, __LINE__, cnt);
- entry = _stp_data_write_reserve(cnt);
- if (likely(entry)) {
- memcpy(entry->buf, bufp, cnt);
- _stp_data_write_commit(entry);
- bufp += cnt;
- }
- else {
- atomic_inc (&_stp_transport_failures);
- break;
- }
+ bytes_reserved = _stp_data_write_reserve(len, &entry);
+ if (likely(entry && bytes_reserved > 0)) {
+ memcpy(entry->buf, 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);
diff --git a/runtime/transport/ring_buffer.c b/runtime/transport/ring_buffer.c
index 1d46c378..abe9c360 100644
--- a/runtime/transport/ring_buffer.c
+++ b/runtime/transport/ring_buffer.c
@@ -317,6 +317,15 @@ static struct file_operations __stp_data_fops = {
#endif
};
+/* Here's how __STP_MAX_RESERVE_SIZE is figured. The value of
+ * BUF_PAGE_SIZE was gotten from the kernel's ring_buffer code. It
+ * is divided by 4, so we waste a maximum of 1/4 of the buffer (in
+ * the case of a small reservation). We then subtract the sizes of
+ * structures needed for every reservation. */
+#define __STP_MAX_RESERVE_SIZE ((/*BUF_PAGE_SIZE*/ 4080 / 4) \
+ - sizeof(struct _stp_entry) \
+ - sizeof(struct ring_buffer_event))
+
/*
* This function prepares the cpu buffer to write a sample.
*
@@ -329,24 +338,31 @@ static struct file_operations __stp_data_fops = {
* sample.
*
*/
-static struct _stp_entry *
-_stp_data_write_reserve(size_t size)
+static size_t
+_stp_data_write_reserve(size_t size_request, struct _stp_entry **entry)
{
struct ring_buffer_event *event;
- struct _stp_entry *entry;
+
+ if (entry == NULL)
+ return -EINVAL;
+
+ if (size_request > __STP_MAX_RESERVE_SIZE) {
+ size_request = __STP_MAX_RESERVE_SIZE;
+ }
event = ring_buffer_lock_reserve(__stp_ring_buffer,
- (sizeof(struct _stp_entry) + size),
+ (sizeof(struct _stp_entry) + size_request),
0);
if (unlikely(! event)) {
dbug_trans(1, "event = NULL (%p)?\n", event);
- return NULL;
+ entry = NULL;
+ return 0;
}
- entry = ring_buffer_event_data(event);
- entry->event = event;
- entry->len = size;
- return entry;
+ *entry = ring_buffer_event_data(event);
+ (*entry)->event = event;
+ (*entry)->len = size_request;
+ return size_request;
}
static int _stp_data_write_commit(struct _stp_entry *entry)
diff --git a/runtime/transport/transport.h b/runtime/transport/transport.h
index feaa950c..7d1f5c5d 100644
--- a/runtime/transport/transport.h
+++ b/runtime/transport/transport.h
@@ -70,7 +70,8 @@ struct _stp_entry {
char buf[];
};
-static struct _stp_entry *_stp_data_write_reserve(size_t size);
+static size_t _stp_data_write_reserve(size_t size_request,
+ struct _stp_entry **entry);
static int _stp_data_write_commit(struct _stp_entry *entry);
#endif /* _TRANSPORT_TRANSPORT_H_ */
generated by cgit (git 2.34.1) at 2025-08-05 13:08:13 +0000