From: Maynard J. <may...@us...> - 2007-12-10 23:40:47
|
Update of /cvsroot/oprofile/oprofile/agents/jvmti In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28686/agents/jvmti Modified Files: Tag: JIT_SUPPORT libjvmti_oprofile.c Log Message: Remove include-code=no option Index: libjvmti_oprofile.c =================================================================== RCS file: /cvsroot/oprofile/oprofile/agents/jvmti/Attic/libjvmti_oprofile.c,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -u -p -d -r1.1.2.11 -r1.1.2.12 --- libjvmti_oprofile.c 9 Dec 2007 20:26:04 -0000 1.1.2.11 +++ libjvmti_oprofile.c 10 Dec 2007 23:40:47 -0000 1.1.2.12 @@ -227,18 +227,14 @@ Agent_OnLoad(JavaVM * jvm, char * option jvmtiJlocationFormat format; jvmtiError error; int err; - int include_code = 0; reserved = reserved; /* shut up compiler warning */ fprintf(stderr, "jvmti_oprofile: agent activated\n"); - if (options && strstr(options, "debug")) + if (options && !strcmp("debug", options)) debug = 1; - if (options && strstr(options, "include-code")) - include_code = 1; - - err = op_open_agent(include_code); + err = op_open_agent(); if (err) { fprintf(stderr, "Error: op_open_agent(), rc=%i\n", err); return -1; @@ -272,7 +268,6 @@ Agent_OnLoad(JavaVM * jvm, char * option callbacks.CompiledMethodLoad = cb_compiled_method_load; callbacks.CompiledMethodUnload = cb_compiled_method_unload; callbacks.DynamicCodeGenerated = cb_dynamic_code_generated; - error = (*jvmti)->SetEventCallbacks(jvmti, &callbacks, sizeof(callbacks)); if (handle_error(error, "SetEventCallbacks()", 1)) @@ -288,13 +283,11 @@ Agent_OnLoad(JavaVM * jvm, char * option if (handle_error(error, "SetEventNotificationMode() " "JVMTI_EVENT_COMPILED_METHOD_UNLOAD", 1)) return -1; - error = (*jvmti)->SetEventNotificationMode( - jvmti, JVMTI_ENABLE, - JVMTI_EVENT_DYNAMIC_CODE_GENERATED, NULL); + error = (*jvmti)->SetEventNotificationMode(jvmti, JVMTI_ENABLE, + JVMTI_EVENT_DYNAMIC_CODE_GENERATED, NULL); if (handle_error(error, "SetEventNotificationMode() " "JVMTI_EVENT_DYNAMIC_CODE_GENERATED", 1)) return -1; - return 0; } |