performance: make support for ScriptIgnoreAttribute optional

tjanczuk · Mar 29, 2013 · 1e81d94 · 1e81d94
1 parent b857ca2
commit 1e81d94
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/src/clrfunc.cpp b/src/clrfunc.cpp
@@ -245,20 +245,23 @@ Handle<v8::Value> ClrFunc::MarshalCLRObjectToV8(System::Object^ netdata)
 
     for each (PropertyInfo^ property in type->GetProperties(BindingFlags::GetProperty | BindingFlags::Public | BindingFlags::Instance))
     {
-        if (property->IsDefined(System::Web::Script::Serialization::ScriptIgnoreAttribute::typeid, true))
+        if (enableScriptIgnoreAttribute)
         {
-            continue;
-        }
+            if (property->IsDefined(System::Web::Script::Serialization::ScriptIgnoreAttribute::typeid, true))
+            {
+                continue;
+            }
 
-        System::Web::Script::Serialization::ScriptIgnoreAttribute^ attr =
-            (System::Web::Script::Serialization::ScriptIgnoreAttribute^)System::Attribute::GetCustomAttribute(
-                property, 
-                System::Web::Script::Serialization::ScriptIgnoreAttribute::typeid,
-                true);
+            System::Web::Script::Serialization::ScriptIgnoreAttribute^ attr =
+                (System::Web::Script::Serialization::ScriptIgnoreAttribute^)System::Attribute::GetCustomAttribute(
+                    property, 
+                    System::Web::Script::Serialization::ScriptIgnoreAttribute::typeid,
+                    true);
 
-        if (attr != nullptr && attr->ApplyToOverrides)
-        {
-            continue;
+            if (attr != nullptr && attr->ApplyToOverrides)
+            {
+                continue;
+            }
         }
 
         MethodInfo^ getMethod = property->GetGetMethod();

diff --git a/src/edge.cpp b/src/edge.cpp
@@ -1,6 +1,7 @@
 #include "edge.h"
 
 BOOL debugMode;
+BOOL enableScriptIgnoreAttribute;
 Persistent<Function> bufferConstructor;
 
 Handle<Value> initializeClrFunc(const v8::Arguments& args)
@@ -15,6 +16,7 @@ void init(Handle<Object> target)
     bufferConstructor = Persistent<Function>::New(Handle<Function>::Cast(
         Context::GetCurrent()->Global()->Get(String::New("Buffer")))); 
     debugMode = (0 < GetEnvironmentVariable("EDGE_DEBUG", NULL, 0));
+    enableScriptIgnoreAttribute = (0 < GetEnvironmentVariable("EDGE_ENABLE_SCRIPTIGNOREATTRIBUTE", NULL, 0));
     NODE_SET_METHOD(target, "initializeClrFunc", initializeClrFunc);
 }
 

diff --git a/src/edge.h b/src/edge.h
@@ -22,6 +22,7 @@ using namespace System::Web::Script::Serialization;
 // Good explanation of native Buffers at 
 // http://sambro.is-super-awesome.com/2011/03/03/creating-a-proper-buffer-in-a-node-c-addon/
 extern BOOL debugMode;
+extern BOOL enableScriptIgnoreAttribute;
 extern Persistent<Function> bufferConstructor;
 
 Handle<v8::String> stringCLR2V8(System::String^ text);