Skip to content

Commit

Permalink
Use Func avaialble in older framework versions for calling the AgentS…
Browse files Browse the repository at this point in the history 
…him.
  • Loading branch information
@nrcventura
nrcventura committed Nov 8, 2023
1 parent e71731d commit f273fa5
Show file tree
Hide file tree
Showing 2 changed files with 95 additions and 94 deletions.
24 changes: 23 additions & 1 deletion src/Agent/NewRelic/Agent/Core/AgentShim.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,29 @@ static bool DeferInitialization(string method)
/// </returns>
public static object GetFinishTracerDelegateFunc()
{
return (Func<string, uint, string, string, Type, string, string, string, object, object[], ulong, Action<object, Exception>>)GetFinishTracerDelegate;
return (Func<object[], Action<object, Exception>>)GetFinishTracerDelegateParameterWrapper;
}

/// <summary>
/// This method is used to work around .net framework ad .net < 6.0 not supporting generic delegates
/// with 11 parameters.
/// </summary>
/// <param name="parameters">An array of boxed parameters for the GetFinishTracerDelegate method.</param>
/// <returns><The delegate to invoke when a method completes or results in an exception./returns>
public static Action<object, Exception> GetFinishTracerDelegateParameterWrapper(object[] parameters)
{
return GetFinishTracerDelegate(
(string)parameters[0],
(uint)parameters[1],
(string)parameters[2],
(string)parameters[3],
(Type)parameters[4],
(string)parameters[5],
(string)parameters[6],
(string)parameters[7],
parameters[8],
(object[])parameters[9],
(ulong)parameters[10]);
}

/// <summary>
Expand Down
165 changes: 72 additions & 93 deletions src/Agent/NewRelic/Profiler/MethodRewriter/InstrumentFunctionManipulator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ namespace NewRelic { namespace Profiler { namespace MethodRewriter
{
// set the stack size required to handle these instructions (remember that we push all of this functions arguments onto the stack to recursively call)
auto originalStackSize = GetHeader()->GetMaxStack();
unsigned maxStackSize = std::max<unsigned>(std::max<unsigned>(originalStackSize, 20), unsigned(_methodSignature->_parameters->size() + 1));
unsigned maxStackSize = std::max<unsigned>(std::max<unsigned>(originalStackSize, 10), unsigned(_methodSignature->_parameters->size() + 1));
GetHeader()->SetMaxStack(maxStackSize);

AppendDefaultLocals();
Expand Down Expand Up @@ -156,110 +156,89 @@ namespace NewRelic { namespace Profiler { namespace MethodRewriter

void CallGetTracer(NewRelic::Profiler::Configuration::InstrumentationPointPtr instrumentationPoint)
{
// if we are using MethodInfo.Invoke the invocation will look like
// tracer = delegates.Invoke(null, new object[] { tracerFactoryName, tracerFactoryArgs, metricName, assemblyName, type, typeName, functionName, argumentSignatureString, this, new object[], functionId });
// oterwise we are using Func.Invoke and it will look like
// tracer = delegates.Invoke(new object[] { tracerFactoryName, tracerFactoryArgs, metricName, assemblyName, type, typeName, functionName, argumentSignatureString, this, new object[], functionId });

if (_agentCallStrategy == AgentCallStyle::Strategy::InAgentCache)
{
// Ensure that the managed agent is loaded
_instructions->AppendString(_instrumentationSettings->GetCorePath());
_instructions->Append(_X("call void [") + _instructions->GetCoreLibAssemblyName() + _X("]System.CannotUnloadAppDomainException::EnsureInitialized(string)"));

// Call the agent shim delegate

// Get the Func holding a reference to NewRelic.Agent.Core.AgentShim.GetFinishTracerDelegate
// Get the Func holding a reference to NewRelic.Agent.Core.AgentShim.GetFinishTracerDelegateParameterWrapper
_instructions->Append(_X("call object [") + _instructions->GetCoreLibAssemblyName() + _X("]System.CannotUnloadAppDomainException::GetAgentShimFinishTracerDelegateMethod()"));
_instructions->Append(CEE_CASTCLASS, _X("class [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Func`12<string, uint32, string, string, class [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Type, string, string, string, object, object[], uint64, class [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Action`2<object, class [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Exception>>"));

_instructions->Append(_X("ldstr ") + instrumentationPoint->TracerFactoryName);

_instructions->Append(CEE_LDC_I4, instrumentationPoint->TracerFactoryArgs);

_instructions->Append(_X("ldstr ") + instrumentationPoint->MetricName);

_instructions->Append(_X("ldstr ") + _function->GetAssemblyName());

_instructions->Append(CEE_LDTOKEN, _function->GetTypeToken());
_instructions->Append(_X("call class [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Type [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Type::GetTypeFromHandle(valuetype [") + _instructions->GetCoreLibAssemblyName() + _X("]System.RuntimeTypeHandle)"));

_instructions->Append(_X("ldstr ") + _function->GetTypeName());

_instructions->Append(_X("ldstr ") + _function->GetFunctionName());

// pass the stringified method signature to GetTracer
auto signatureString = _methodSignature->ToString(_function->GetTokenResolver());
_instructions->Append(_X("ldstr ") + signatureString);

if (_methodSignature->_hasThis) _instructions->AppendLoadArgument(0);
else _instructions->Append(_X("ldnull"));

// turn the parameters passed into this method into an object array
BuildObjectArrayOfParameters();

// It's important to upcast the function id here. It's an int on WIN32
_instructions->Append(CEE_LDC_I8, (uint64_t)_function->GetFunctionId());

// make the call to GetFinishTracerDelegate
_instructions->Append(CEE_CALLVIRT, _X("instance !11 class [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Func`12<string, uint32, string, string, class [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Type, string, string, string, object, object[], uint64, class [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Action`2<object, class [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Exception>>::Invoke(!0, !1, !2, !3, !4, !5, !6, !7, !8, !9, !10)"));
_instructions->Append(CEE_CASTCLASS, _X("class [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Func`2<object[], class [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Action`2<object, class [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Exception>>"));
}
else
{
LoadMethodInfo(_instrumentationSettings->GetCorePath(), _X("NewRelic.Agent.Core.AgentShim"), _X("GetFinishTracerDelegate"), 0, nullptr);

// tracer = delegates[0].Invoke(null, new object[] { tracerFactoryName, tracerFactoryArgs, metricName, assemblyName, type, typeName, functionName, argumentSignatureString, this, new object[], functionId });
_instructions->Append(_X("ldnull"));
_instructions->Append(_X("ldc.i4.s 11"));
_instructions->Append(_X("newarr [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Object"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.0"));
_instructions->Append(_X("ldstr ") + instrumentationPoint->TracerFactoryName);
_instructions->Append(_X("stelem.ref"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.1"));
_instructions->Append(CEE_LDC_I4, instrumentationPoint->TracerFactoryArgs);
_instructions->Append(_X("box [") + _instructions->GetCoreLibAssemblyName() + _X("]System.UInt32"));
_instructions->Append(_X("stelem.ref"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.2"));
_instructions->Append(_X("ldstr ") + instrumentationPoint->MetricName);
_instructions->Append(_X("stelem.ref"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.3"));
_instructions->Append(_X("ldstr ") + _function->GetAssemblyName());
_instructions->Append(_X("stelem.ref"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.4"));
_instructions->Append(CEE_LDTOKEN, _function->GetTypeToken());
_instructions->Append(_X("call class [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Type [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Type::GetTypeFromHandle(valuetype [") + _instructions->GetCoreLibAssemblyName() + _X("]System.RuntimeTypeHandle)"));
_instructions->Append(_X("stelem.ref"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.5"));
_instructions->Append(_X("ldstr ") + _function->GetTypeName());
_instructions->Append(_X("stelem.ref"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.6"));
_instructions->Append(_X("ldstr ") + _function->GetFunctionName());
_instructions->Append(_X("stelem.ref"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.7"));
// pass the stringified method signature to GetTracer
auto signatureString = _methodSignature->ToString(_function->GetTokenResolver());
_instructions->Append(_X("ldstr ") + signatureString);
_instructions->Append(_X("stelem.ref"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.8"));
if (_methodSignature->_hasThis) _instructions->AppendLoadArgument(0);
else _instructions->Append(_X("ldnull"));
_instructions->Append(_X("stelem.ref"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.s 9"));
// turn the parameters passed into this method into an object array
BuildObjectArrayOfParameters();
_instructions->Append(_X("stelem.ref"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.s 10"));
// It's important to upcast the function id here. It's an int on WIN32
_instructions->Append(CEE_LDC_I8, (uint64_t)_function->GetFunctionId());
_instructions->Append(_X("box [") + _instructions->GetCoreLibAssemblyName() + _X("]System.UInt64"));
_instructions->Append(_X("stelem.ref"));
// make the call to GetTracer
}

_instructions->Append(_X("ldc.i4.s 11"));
_instructions->Append(_X("newarr [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Object"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.0"));
_instructions->Append(_X("ldstr ") + instrumentationPoint->TracerFactoryName);
_instructions->Append(_X("stelem.ref"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.1"));
_instructions->Append(CEE_LDC_I4, instrumentationPoint->TracerFactoryArgs);
_instructions->Append(_X("box [") + _instructions->GetCoreLibAssemblyName() + _X("]System.UInt32"));
_instructions->Append(_X("stelem.ref"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.2"));
_instructions->Append(_X("ldstr ") + instrumentationPoint->MetricName);
_instructions->Append(_X("stelem.ref"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.3"));
_instructions->Append(_X("ldstr ") + _function->GetAssemblyName());
_instructions->Append(_X("stelem.ref"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.4"));
_instructions->Append(CEE_LDTOKEN, _function->GetTypeToken());
_instructions->Append(_X("call class [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Type [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Type::GetTypeFromHandle(valuetype [") + _instructions->GetCoreLibAssemblyName() + _X("]System.RuntimeTypeHandle)"));
_instructions->Append(_X("stelem.ref"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.5"));
_instructions->Append(_X("ldstr ") + _function->GetTypeName());
_instructions->Append(_X("stelem.ref"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.6"));
_instructions->Append(_X("ldstr ") + _function->GetFunctionName());
_instructions->Append(_X("stelem.ref"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.7"));
// pass the stringified method signature to GetTracer
auto signatureString = _methodSignature->ToString(_function->GetTokenResolver());
_instructions->Append(_X("ldstr ") + signatureString);
_instructions->Append(_X("stelem.ref"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.8"));
if (_methodSignature->_hasThis) _instructions->AppendLoadArgument(0);
else _instructions->Append(_X("ldnull"));
_instructions->Append(_X("stelem.ref"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.s 9"));
// turn the parameters passed into this method into an object array
BuildObjectArrayOfParameters();
_instructions->Append(_X("stelem.ref"));
_instructions->Append(_X("dup"));
_instructions->Append(_X("ldc.i4.s 10"));
// It's important to upcast the function id here. It's an int on WIN32
_instructions->Append(CEE_LDC_I8, (uint64_t)_function->GetFunctionId());
_instructions->Append(_X("box [") + _instructions->GetCoreLibAssemblyName() + _X("]System.UInt64"));
_instructions->Append(_X("stelem.ref"));

// make the call to GetTracer
if (_agentCallStrategy == AgentCallStyle::Strategy::InAgentCache)
{
_instructions->Append(CEE_CALLVIRT, _X("instance !1 class [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Func`2<object[], class [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Action`2<object, class [") + _instructions->GetCoreLibAssemblyName() + _X("]System.Exception>>::Invoke(!0)"));
}
else
{
InvokeMethodInfo();
}

Expand Down

0 comments on commit f273fa5

Please sign in to comment.