allow dynamic strings in telemeh, use it for nativecall func names

MoarVM · Apr 19, 2017 · f979442 · f979442
1 parent 7df11b9
commit f979442
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 1 deletion.
diff --git a/src/core/nativecall.c b/src/core/nativecall.c
@@ -378,6 +378,8 @@ void MVM_nativecall_build(MVMThreadContext *tc, MVMObject *site, MVMString *lib,
     MVMint8  keep_sym_name = 0;
     MVMint16 i;
 
+    unsigned int interval_id = startInterval(tc, "building native call");
+
     MVMObject *entry_point_o = (MVMObject *)MVM_repr_at_key_o(tc, ret_info,
         tc->instance->str_consts.entry_point);
 
@@ -391,6 +393,7 @@ void MVM_nativecall_build(MVMThreadContext *tc, MVMObject *site, MVMString *lib,
     if (!body->lib_handle) {
         char *waste[] = { lib_name, NULL };
         MVM_free(sym_name);
+        stopInterval(tc, interval_id, "error building native call");
         MVM_exception_throw_adhoc_free(tc, waste, "Cannot locate native library '%s': %s", lib_name, dlerror());
     }
 
@@ -405,13 +408,16 @@ void MVM_nativecall_build(MVMThreadContext *tc, MVMObject *site, MVMString *lib,
         body->entry_point = MVM_nativecall_find_sym(body->lib_handle, sym_name);
         if (!body->entry_point) {
             char *waste[] = { sym_name, lib_name, NULL };
+            stopInterval(tc, interval_id, "error building native call");
             MVM_exception_throw_adhoc_free(tc, waste, "Cannot locate symbol '%s' in native library '%s'",
                 sym_name, lib_name);
         }
         body->sym_name = sym_name;
         keep_sym_name     = 1;
     }
 
+    annotateIntervalDynamic(body->entry_point, interval_id, body->sym_name);
+
     if (keep_sym_name == 0) {
         MVM_free(sym_name);
     }
@@ -446,6 +452,8 @@ void MVM_nativecall_build(MVMThreadContext *tc, MVMObject *site, MVMString *lib,
 #ifdef HAVE_LIBFFI
     body->ffi_ret_type = MVM_nativecall_get_ffi_type(tc, body->ret_type);
 #endif
+
+    stopInterval(tc, interval_id, "nativecall built");
 }
 
 static MVMObject * nativecall_cast(MVMThreadContext *tc, MVMObject *target_spec, MVMObject *target_type, void *cpointer_body) {

diff --git a/src/core/nativecall_dyncall.c b/src/core/nativecall_dyncall.c
@@ -490,6 +490,7 @@ MVMObject * MVM_nativecall_invoke(MVMThreadContext *tc, MVMObject *res_type,
     dcReset(vm);
 
     interval_id = startInterval(tc, "nativecall invoke");
+    annotateInterval(entry_point, interval_id, "nc entrypoint");
 
     /* Process arguments. */
     for (i = 0; i < num_args; i++) {

diff --git a/src/core/nativecall_libffi.c b/src/core/nativecall_libffi.c
@@ -489,6 +489,7 @@ MVMObject * MVM_nativecall_invoke(MVMThreadContext *tc, MVMObject *res_type,
     ffi_status status  = ffi_prep_cif(&cif, body->convention, (unsigned int)num_args, body->ffi_ret_type, body->ffi_arg_types);
 
     interval_id = startInterval(tc, "nativecall invoke");
+    annotateInterval(entry_point, interval_id, "nc entrypoint");
 
     /* Process arguments. */
     for (i = 0; i < num_args; i++) {

diff --git a/src/profiler/telemeh.c b/src/profiler/telemeh.c
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <unistd.h>
+#include <string.h>
 
 #ifdef _WIN32
 #include <intrin.h>
@@ -24,7 +25,8 @@ enum RecordType {
     TimeStamp,
     IntervalStart,
     IntervalEnd,
-    IntervalAnnotation
+    IntervalAnnotation,
+    DynamicString
 };
 
 struct CalibrationRecord {
@@ -51,6 +53,11 @@ struct IntervalAnnotation {
     const char *description;
 };
 
+struct DynamicString {
+    unsigned int intervalID;
+    char *description;
+};
+
 struct TelemetryRecord {
     enum RecordType recordType;
 
@@ -62,6 +69,7 @@ struct TelemetryRecord {
         struct TimeStampRecord timeStamp;
         struct IntervalRecord interval;
         struct IntervalAnnotation annotation;
+        struct DynamicString annotation_dynamic;
     };
 };
 
@@ -151,6 +159,22 @@ void annotateInterval(intptr_t subject, int intervalID, const char *description)
     record->annotation.description = description;
 }
 
+void annotateIntervalDynamic(intptr_t subject, int intervalID, char *description) {
+    struct TelemetryRecord *record;
+    char *temp;
+
+    if (!telemetry_active) { return; }
+
+    temp = malloc(strlen(description) + 1);
+    strncpy(temp, description, strlen(description) + 1);
+
+    record = newRecord();
+    record->recordType = DynamicString;
+    record->threadID = subject;
+    record->annotation_dynamic.intervalID = intervalID;
+    record->annotation_dynamic.description = temp;
+}
+
 void calibrateTSC(FILE *outfile)
 {
     unsigned long long startTsc, endTsc;
@@ -205,6 +229,10 @@ void serializeTelemetryBufferRange(FILE *outfile, unsigned int serializationStar
             case IntervalAnnotation:
                 fprintf(outfile,  "%15s ??? Annotation:     \"%s\" (%d)\n", " ", record->annotation.description, record->annotation.intervalID);
                 break;
+            case DynamicString:
+                fprintf(outfile,  "%15s ??? Annotation:     \"%s\" (%d)\n", " ", record->annotation_dynamic.description, record->annotation_dynamic.intervalID);
+                free(record->annotation_dynamic.description);
+                break;
         }
     }
 }

diff --git a/src/profiler/telemeh.h b/src/profiler/telemeh.h
@@ -5,6 +5,7 @@ void takeTimeStamp(intptr_t threadID, const char *description);
 unsigned int startInterval(intptr_t threadID, const char *description);
 void stopInterval(intptr_t threadID, int intervalID, const char *description);
 void annotateInterval(intptr_t subject, int intervalID, const char *description);
+void annotateIntervalDynamic(intptr_t subject, int intervalID, char *description);
 
 void initTelemetry(FILE *outfile);
 void finishTelemetry();