erts: Add lttng tracepoints for memory carriers

* carrier_create
* carrier_destroy
* carrier_pool_put
* carrier_pool_get

4 files changed, 148 insertions, 5 deletions

diff --git a/erts/emulator/beam/erl_alloc.h b/erts/emulator/beam/erl_alloc.h
index 71e4713624..ee2013bd93 100644
--- a/erts/emulator/beam/erl_alloc.h
+++ b/erts/emulator/beam/erl_alloc.h
@@ -235,9 +235,9 @@ void *erts_alloc(ErtsAlcType_t type, Uint size)
     void *res;
     ERTS_MSACC_PUSH_AND_SET_STATE_X(ERTS_MSACC_STATE_ALLOC);
     res = (*erts_allctrs[ERTS_ALC_T2A(type)].alloc)(
-	ERTS_ALC_T2N(type),
-	erts_allctrs[ERTS_ALC_T2A(type)].extra,
-	size);
+            ERTS_ALC_T2N(type),
+            erts_allctrs[ERTS_ALC_T2A(type)].extra,
+            size);
     if (!res)
 	erts_alloc_n_enomem(ERTS_ALC_T2N(type), size);
     ERTS_MSACC_POP_STATE_X();
@@ -564,5 +564,3 @@ NAME##_free(TYPE *p)							\
 #undef ERTS_ALC_ATTRIBUTES
 
 #endif /* #ifndef ERL_ALLOC_H__ */
-
-
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c
index 5e7dd7cce8..6e682019ba 100644
--- a/erts/emulator/beam/erl_alloc_util.c
+++ b/erts/emulator/beam/erl_alloc_util.c
@@ -52,6 +52,7 @@
 #ifdef ERTS_ENABLE_LOCK_COUNT
 #include "erl_lock_count.h"
 #endif
+#include "lttng-wrapper.h"
 
 #if defined(ERTS_ALLOC_UTIL_HARD_DEBUG) && defined(__GNUC__)
 #warning "* * * * * * * * * *"
@@ -3125,6 +3126,7 @@ cpool_insert(Allctr_t *allctr, Carrier_t *crr)
 
     erts_smp_atomic_set_wb(&crr->allctr,
 			   ((erts_aint_t) allctr)|ERTS_CRR_ALCTR_FLG_IN_POOL);
+    LTTNG3(carrier_pool_put, ERTS_ALC_A2AD(allctr->alloc_no), allctr->ix, CARRIER_SZ(crr));
 }
 
 static void
@@ -3240,6 +3242,7 @@ cpool_fetch(Allctr_t *allctr, UWord size)
     first_old_traitor = allctr->cpool.traitor_list.next;
     cpool_entrance = NULL;
 
+    LTTNG3(carrier_pool_get, ERTS_ALC_A2AD(allctr->alloc_no), allctr->ix, (unsigned long)size);
     /*
      * Search my own pooled_list,
      * i.e my abandoned carriers that were in the pool last time I checked.
@@ -3925,6 +3928,21 @@ create_carrier(Allctr_t *allctr, Uint umem_sz, UWord flags)
 
     }
 
+#ifdef USE_LTTNG_VM_TRACEPOINTS
+    if (LTTNG_ENABLED(carrier_create)) {
+        lttng_decl_carrier_stats(mbc_stats);
+        lttng_decl_carrier_stats(sbc_stats);
+        LTTNG_CARRIER_STATS_TO_LTTNG_STATS(&(allctr->mbcs), mbc_stats);
+        LTTNG_CARRIER_STATS_TO_LTTNG_STATS(&(allctr->sbcs), sbc_stats);
+        LTTNG5(carrier_create,
+                ERTS_ALC_A2AD(allctr->alloc_no),
+                allctr->ix,
+                crr_sz,
+                mbc_stats,
+                sbc_stats);
+    }
+#endif
+
     DEBUG_SAVE_ALIGNMENT(crr);
     return blk;
 }
@@ -4148,6 +4166,21 @@ destroy_carrier(Allctr_t *allctr, Block_t *blk, Carrier_t **busy_pcrr_pp)
                 allctr->remove_mbc(allctr, crr);
 	}
 
+#ifdef USE_LTTNG_VM_TRACEPOINTS
+        if (LTTNG_ENABLED(carrier_destroy)) {
+            lttng_decl_carrier_stats(mbc_stats);
+            lttng_decl_carrier_stats(sbc_stats);
+            LTTNG_CARRIER_STATS_TO_LTTNG_STATS(&(allctr->mbcs), mbc_stats);
+            LTTNG_CARRIER_STATS_TO_LTTNG_STATS(&(allctr->sbcs), sbc_stats);
+            LTTNG5(carrier_destroy,
+                ERTS_ALC_A2AD(allctr->alloc_no),
+                allctr->ix,
+                crr_sz,
+                mbc_stats,
+                sbc_stats);
+        }
+#endif
+
 #ifdef ERTS_SMP
 	schedule_dealloc_carrier(allctr, crr);
 #else
diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h
index b7d717ed23..afdff1a71e 100644
--- a/erts/emulator/beam/erl_alloc_util.h
+++ b/erts/emulator/beam/erl_alloc_util.h
@@ -30,6 +30,7 @@
 #endif
 
 #include "erl_mseg.h"
+#include "lttng-wrapper.h"
 
 #define ERTS_AU_PREF_ALLOC_BITS 11
 #define ERTS_AU_MAX_PREF_ALLOC_INSTANCES (1 << ERTS_AU_PREF_ALLOC_BITS)
@@ -417,6 +418,18 @@ typedef struct {
     } blocks;
 } CarriersStats_t;
 
+#ifdef USE_LTTNG_VM_TRACEPOINTS
+#define LTTNG_CARRIER_STATS_TO_LTTNG_STATS(CSP, LSP)            \
+    do {                                                        \
+        (LSP)->carriers.size = (CSP)->curr.norm.mseg.size       \
+                             + (CSP)->curr.norm.sys_alloc.size; \
+        (LSP)->carriers.no   = (CSP)->curr.norm.mseg.no         \
+                             + (CSP)->curr.norm.sys_alloc.no;   \
+        (LSP)->blocks.size   = (CSP)->blocks.curr.size;         \
+        (LSP)->blocks.no     = (CSP)->blocks.curr.no;           \
+    } while (0)
+#endif
+
 #ifdef ERTS_SMP
 
 typedef union ErtsAllctrDDBlock_t_ ErtsAllctrDDBlock_t;
diff --git a/erts/emulator/beam/erlang_lttng.h b/erts/emulator/beam/erlang_lttng.h
index 48956cf242..2fab6fb698 100644
--- a/erts/emulator/beam/erlang_lttng.h
+++ b/erts/emulator/beam/erlang_lttng.h
@@ -31,6 +31,105 @@
 #include <lttng/tracepoint.h>
 
 
+#ifndef LTTNG_CARRIER_STATS
+#define LTTNG_CARRIER_STATS
+typedef struct {
+    unsigned long no;
+    unsigned long size;
+} lttng_stat_values_t;
+
+typedef struct {
+    lttng_stat_values_t carriers;
+    lttng_stat_values_t blocks;
+} lttng_carrier_stats_t;
+#endif
+
+
+/* Memory Allocator */
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    carrier_create,
+    TP_ARGS(
+        const char*, type,
+        int, instance,
+        unsigned long, size,
+        lttng_carrier_stats_t *, mbcs,
+        lttng_carrier_stats_t *, sbcs
+    ),
+    TP_FIELDS(
+        ctf_string(type, type)
+        ctf_integer(int, instance, instance)
+        ctf_integer(unsigned long, size, size)
+        ctf_float(float, mbc_ratio, (float)mbcs->blocks.size/(float)mbcs->carriers.size)
+        ctf_integer(unsigned long, mbc_carriers, mbcs->carriers.no)
+        ctf_integer(unsigned long, mbc_carriers_size, mbcs->carriers.size)
+        ctf_integer(unsigned long, mbc_blocks, mbcs->blocks.no)
+        ctf_integer(unsigned long, mbc_blocks_size, mbcs->blocks.size)
+        ctf_integer(unsigned long, sbc_carriers, sbcs->carriers.no)
+        ctf_integer(unsigned long, sbc_carriers_size, sbcs->carriers.size)
+        ctf_integer(unsigned long, sbc_blocks, sbcs->blocks.no)
+        ctf_integer(unsigned long, sbc_blocks_size, sbcs->blocks.size)
+    )
+)
+
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    carrier_destroy,
+    TP_ARGS(
+        const char*, type,
+        int, instance,
+        unsigned long, size,
+        lttng_carrier_stats_t *, mbcs,
+        lttng_carrier_stats_t *, sbcs
+    ),
+    TP_FIELDS(
+        ctf_string(type, type)
+        ctf_integer(int, instance, instance)
+        ctf_integer(unsigned long, size, size)
+        ctf_float(float, mbc_ratio, (float)mbcs->blocks.size/(float)mbcs->carriers.size)
+        ctf_integer(unsigned long, mbc_carriers, mbcs->carriers.no)
+        ctf_integer(unsigned long, mbc_carriers_size, mbcs->carriers.size)
+        ctf_integer(unsigned long, mbc_blocks, mbcs->blocks.no)
+        ctf_integer(unsigned long, mbc_blocks_size, mbcs->blocks.size)
+        ctf_integer(unsigned long, sbc_carriers, sbcs->carriers.no)
+        ctf_integer(unsigned long, sbc_carriers_size, sbcs->carriers.size)
+        ctf_integer(unsigned long, sbc_blocks, sbcs->blocks.no)
+        ctf_integer(unsigned long, sbc_blocks_size, sbcs->blocks.size)
+    )
+)
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    carrier_pool_put,
+    TP_ARGS(
+        const char*, name,
+        int, instance,
+        unsigned long, size
+    ),
+    TP_FIELDS(
+        ctf_string(type, name)
+        ctf_integer(int, instance, instance)
+        ctf_integer(unsigned long, size, size)
+    )
+)
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    carrier_pool_get,
+    TP_ARGS(
+        const char*, name,
+        int, instance,
+        unsigned long, size
+    ),
+    TP_FIELDS(
+        ctf_string(type, name)
+        ctf_integer(int, instance, instance)
+        ctf_integer(unsigned long, size, size)
+    )
+)
+
 #endif /* __ERLANG_LTTNG_H__ */
 #include <lttng/tracepoint-event.h>
 #endif /* USE_LTTNG */