You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by re...@apache.org on 2009/12/10 02:17:52 UTC

svn commit: r889047 - /harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp

Author: regisxu
Date: Thu Dec 10 01:17:51 2009
New Revision: 889047

URL: http://svn.apache.org/viewvc?rev=889047&view=rev
Log:
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=889047&r1=889046&r2=889047&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 Dec 10 01:17:51 2009
@@ -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);



Re: svn commit: r889047 - /harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp

Posted by Regis <xu...@gmail.com>.
On 2009-12-10 16:37, Regis wrote:
> On 2009-12-10 16:25, Mark Hindess wrote:
>>
>> Please revert this. DRLVM tree is still frozen for the 6.0M1 release.
>>
>> If you want it unfrozen, then perhaps you should test and report issues
>> so that we can finalize the 6.0M1 release?
>>
>> -Mark
>>
>> In message<20...@eris.apache.org>,
>> regisxu@apache.org
>> writes:
>>>
>>> Author: regisxu
>>> Date: Thu Dec 10 01:17:51 2009
>>> New Revision: 889047
>>>
>>> URL: http://svn.apache.org/viewvc?rev=889047&view=rev
>>> Log:
>>> Apply patch for HARMONY-6399: [drlvm] drlvm doesn't support
>>> "-javaagent" opti
>>> on
>>>
>>>
>>> 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=889047&r1=889046&r2=889047&view=diff
>>> =============================================================================
>>>
>>> =
>>> ---
>>> harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp
>>> (orig
>>> inal)
>>> +++
>>> harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp
>>> Thu D
>>> ec 10 01:17:51 2009
>>> @@ -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);
>>>
>>
>>
>>
>
> Sorry, I thought it is reopened. I'll revert it.
>

Reverted at r889144.

-- 
Best Regards,
Regis.

Re: svn commit: r889047 - /harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp

Posted by Regis <xu...@gmail.com>.
On 2009-12-10 16:25, Mark Hindess wrote:
>
> Please revert this.  DRLVM tree is still frozen for the 6.0M1 release.
>
> If you want it unfrozen, then perhaps you should test and report issues
> so that we can finalize the 6.0M1 release?
>
> -Mark
>
> In message<20...@eris.apache.org>, regisxu@apache.org
> writes:
>>
>> Author: regisxu
>> Date: Thu Dec 10 01:17:51 2009
>> New Revision: 889047
>>
>> URL: http://svn.apache.org/viewvc?rev=889047&view=rev
>> Log:
>> Apply patch for HARMONY-6399: [drlvm] drlvm doesn't support "-javaagent" opti
>> on
>>
>>
>> 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=889047&r1=889046&r2=889047&view=diff
>> =============================================================================
>> =
>> --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp (orig
>> inal)
>> +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp Thu D
>> ec 10 01:17:51 2009
>> @@ -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);
>>
>
>
>

Sorry, I thought it is reopened. I'll revert it.

-- 
Best Regards,
Regis.

Re: svn commit: r889047 - /harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp

Posted by Mark Hindess <ma...@googlemail.com>.
Please revert this.  DRLVM tree is still frozen for the 6.0M1 release.

If you want it unfrozen, then perhaps you should test and report issues
so that we can finalize the 6.0M1 release?

-Mark

In message <20...@eris.apache.org>, regisxu@apache.org
writes:
>
> Author: regisxu
> Date: Thu Dec 10 01:17:51 2009
> New Revision: 889047
> 
> URL: http://svn.apache.org/viewvc?rev=889047&view=rev
> Log:
> Apply patch for HARMONY-6399: [drlvm] drlvm doesn't support "-javaagent" opti
> on
> 
> 
> 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=889047&r1=889046&r2=889047&view=diff
> =============================================================================
> =
> --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp (orig
> inal)
> +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp Thu D
> ec 10 01:17:51 2009
> @@ -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);
>