harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r901641 - /harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp
Date Thu, 21 Jan 2010 10:35:18 GMT
Author: hindessm
Date: Thu Jan 21 10:35:18 2010
New Revision: 901641

URL: http://svn.apache.org/viewvc?rev=901641&view=rev
Log:
Code freeze over so hopefully fixing the instrument test errors by
re-applying commit:

  r889047 | regisxu | 2009-12-10 01:17:51 +0000 (Thu, 10 Dec 2009) | 3 lines

  Apply patch for HARMONY-6399: [drlvm] drlvm doesn't support "-javaagent"
  option


Modified:
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp?rev=901641&r1=901640&r2=901641&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp Thu Jan 21 10:35:18
2010
@@ -348,6 +348,13 @@
         else if (begins_with(option, "-agentpath:")) {
             p_env->TI->addAgent(option);
         }
+        else if (begins_with(option, "-javaagent:")) {
+            char* dest = (char*) STD_MALLOC(strlen("-agentlib:hyinstrument=") + strlen(option
+ 11) + 1);
+            strcpy(dest, "-agentlib:hyinstrument=");
+            strcat(dest, option + 11);
+            p_env->TI->addAgent(dest);
+            STD_FREE((void*) dest);
+        }
         else if (begins_with(option, "-Xrun")) {
             // Compatibility with JNDI
             p_env->TI->addAgent(option);



Mime
View raw message