Thread: [X10-commits] SF.net SVN: x10:[11771] trunk (Page 9)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 11771
          http://x10.svn.sourceforge.net/x10/?rev=11771&view=rev
Author:   dgrove-oss
Date:     2009-10-27 14:57:28 +0000 (Tue, 27 Oct 2009)

Log Message:
-----------
XRX compiles with C++ backend.

Summary of fixes:  
  change deserialization templates to use Ref instead of Object.
  generate typeName method for sturcts
  define typeName on Ref.
  misc Object ==> Ref changes in handwritten code
  bug fix in numParents computation in codegen for initRTT

Modified Paths:
--------------
    trunk/x10.compiler/src/x10cpp/visit/Emitter.java
    trunk/x10.compiler/src/x10cpp/visit/MessagePassingCodeGenerator.java
    trunk/x10.runtime/src-cpp/x10/io/FileReader__FileInputStream.cc
    trunk/x10.runtime/src-cpp/x10/io/FileWriter__FileOutputStream.cc
    trunk/x10.runtime/src-cpp/x10/io/File__NativeFile.cc
    trunk/x10.runtime/src-cpp/x10/lang/Box.h
    trunk/x10.runtime/src-cpp/x10/lang/Rail.h
    trunk/x10.runtime/src-cpp/x10/lang/Ref.cc
    trunk/x10.runtime/src-cpp/x10/lang/Ref.h
    trunk/x10.runtime/src-cpp/x10/lang/String.cc
    trunk/x10.runtime/src-cpp/x10/lang/String.h
    trunk/x10.runtime/src-cpp/x10/lang/Throwable.cc
    trunk/x10.runtime/src-cpp/x10/lang/ValRail.h
    trunk/x10.runtime/src-cpp/x10/lang/Value.cc
    trunk/x10.runtime/src-cpp/x10/runtime/Deque.cc
    trunk/x10.runtime/src-cpp/x10/runtime/Thread.cc
    trunk/x10.runtime/src-cpp/x10/util/GrowableRail.h
    trunk/x10.runtime/src-cpp/x10/util/concurrent/atomic/AtomicBoolean.cc
    trunk/x10.runtime/src-cpp/x10/util/concurrent/atomic/AtomicInteger.cc
    trunk/x10.runtime/src-cpp/x10/util/concurrent/atomic/AtomicLong.cc
    trunk/x10.runtime/src-cpp/x10aux/deserialization_dispatcher.cc
    trunk/x10.runtime/src-cpp/x10aux/deserialization_dispatcher.h
    trunk/x10.runtime/src-cpp/x10aux/static_init.cc
    trunk/x10.runtime/src-cpp/x10aux/static_init.h

Modified: trunk/x10.compiler/src/x10cpp/visit/Emitter.java
===================================================================

--- trunk/x10.compiler/src/x10cpp/visit/Emitter.java	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.compiler/src/x10cpp/visit/Emitter.java	2009-10-27 14:57:28 UTC (rev 11771)
@@ -602,21 +602,21 @@
     void printRTTDefn(X10ClassType ct, CodeWriter h) {
         X10TypeSystem_c xts = (X10TypeSystem_c) ct.typeSystem();
 		String x10name = ct.fullName().toString();
-		int num_parents = 1 + ct.interfaces().size();
-		// ADJUST FOR ANY.
-		if (ct.superClass() == null || xts.isAny(ct.superClass())) {
-		    num_parents--;
-		} else if (ct.interfaces().size() > 0) {
-		    num_parents--; // IGNORE ANY, which shows up everywhere.
+		int numParents = 0;
+		if (ct.superClass() != null && !xts.isAny(ct.superClass())) {
+		    numParents++;
 		}
+		for (Type iface: ct.interfaces()) {
+		    if (!xts.isAny(iface)) numParents++;
+		}
 		
 		if (ct.typeArguments().isEmpty()) {
 		  boolean first = true;
           h.write("x10aux::RuntimeType "+translateType(ct)+"::rtt;"); h.newline();
           h.write("void "+translateType(ct)+"::_initRTT() {"); h.newline(4); h.begin(0);
           h.write("rtt.canonical = &rtt;"); h.newline();
-          if (num_parents > 0) { 
-              h.write("const x10aux::RuntimeType* parents["+num_parents+"] = { ");
+          if (numParents > 0) { 
+              h.write("const x10aux::RuntimeType* parents["+numParents+"] = { ");
               if (ct.superClass() != null && !xts.isAny(ct.superClass())) {
                   h.write("x10aux::getRTT" + chevrons(translateType(ct.superClass())) + "()");
                   first = false;
@@ -631,7 +631,7 @@
           } else {
               h.write("const x10aux::RuntimeType** parents = NULL; "); h.newline();
           }
-          h.write("rtt.init(&rtt, \""+ct.fullName()+"\", "+num_parents+ ", parents, 0, NULL, NULL);"); h.end(); h.newline();
+          h.write("rtt.init(&rtt, \""+ct.fullName()+"\", "+numParents+ ", parents, 0, NULL, NULL);"); h.end(); h.newline();
           h.write("}"); h.newline();
 		} else {
 		    boolean first = true;
@@ -642,8 +642,8 @@
             printTemplateSignature(ct.typeArguments(), h);
             h.write("void "+translateType(ct)+"::_initRTT() {"); h.newline(4); h.begin(0);
             h.write("rtt.canonical = &rtt;"); h.newline();
-            if (num_parents > 0) {
-                h.write("const x10aux::RuntimeType* parents["+num_parents+"] = { ");
+            if (numParents > 0) {
+                h.write("const x10aux::RuntimeType* parents["+numParents+"] = { ");
                 if (ct.superClass() != null && !xts.isAny(ct.superClass())) {
                     h.write("x10aux::getRTT" + chevrons(translateType(ct.superClass())) + "()");
                     first = false;
@@ -695,7 +695,7 @@
                 h.write(", params["+i+"]->name()"); h.newline();
             }
             h.write(");") ; h.end(); h.newline();
-            h.write("rtt.init(canonical, name, "+num_parents+", parents, "+numTypeParams+", params, variances);"); h.end(); h.newline();
+            h.write("rtt.init(canonical, name, "+numParents+", parents, "+numTypeParams+", params, variances);"); h.end(); h.newline();
             h.write("}"); h.newline();
 		}
 		h.newline();

Modified: trunk/x10.compiler/src/x10cpp/visit/MessagePassingCodeGenerator.java
===================================================================
--- trunk/x10.compiler/src/x10cpp/visit/MessagePassingCodeGenerator.java	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.compiler/src/x10cpp/visit/MessagePassingCodeGenerator.java	2009-10-27 14:57:28 UTC (rev 11771)
@@ -1532,8 +1532,15 @@
             sw.writeln("}"); sw.forceNewline();
         }
         
+        // define typeName
+        sh.writeln("x10aux::ref<x10::lang::String> typeName();"); sh.forceNewline();
+        emitter.printTemplateSignature(currentClass.typeArguments(), sw);
+        sw.write("x10aux::ref<x10::lang::String> "+ Emitter.translateType(currentClass, false)+ "::typeName() {");
+        sw.newline(4); sw.begin(0);
+        sw.writeln("return x10aux::type_name(*this);");
         sw.end();
         sw.newline();
+        sw.writeln("}"); sw.forceNewline();
     }
 
 	private void generateITablesForClass(X10ClassType currentClass,

Modified: trunk/x10.runtime/src-cpp/x10/io/FileReader__FileInputStream.cc
===================================================================
--- trunk/x10.runtime/src-cpp/x10/io/FileReader__FileInputStream.cc	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10/io/FileReader__FileInputStream.cc	2009-10-27 14:57:28 UTC (rev 11771)
@@ -15,7 +15,7 @@
 }
 
 const x10aux::serialization_id_t FileReader__FileInputStream::_serialization_id = 
-    x10aux::DeserializationDispatcher::addDeserializer(FileReader__FileInputStream::_deserializer<x10::lang::Object>);
+    x10aux::DeserializationDispatcher::addDeserializer(FileReader__FileInputStream::_deserializer<x10::lang::Ref>);
 
 void FileReader__FileInputStream::_serialize_body(x10aux::serialization_buffer& buf, x10aux::addr_map& m) {
     InputStreamReader__InputStream::_serialize_body(buf, m);

Modified: trunk/x10.runtime/src-cpp/x10/io/FileWriter__FileOutputStream.cc
===================================================================
--- trunk/x10.runtime/src-cpp/x10/io/FileWriter__FileOutputStream.cc	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10/io/FileWriter__FileOutputStream.cc	2009-10-27 14:57:28 UTC (rev 11771)
@@ -18,7 +18,7 @@
 }
 
 const x10aux::serialization_id_t FileWriter__FileOutputStream::_serialization_id = 
-    x10aux::DeserializationDispatcher::addDeserializer(FileWriter__FileOutputStream::_deserializer<x10::lang::Object>);
+    x10aux::DeserializationDispatcher::addDeserializer(FileWriter__FileOutputStream::_deserializer<x10::lang::Ref>);
 
 void FileWriter__FileOutputStream::_serialize_body(x10aux::serialization_buffer& buf, x10aux::addr_map& m) {
     OutputStreamWriter__OutputStream::_serialize_body(buf, m);

Modified: trunk/x10.runtime/src-cpp/x10/io/File__NativeFile.cc
===================================================================
--- trunk/x10.runtime/src-cpp/x10/io/File__NativeFile.cc	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10/io/File__NativeFile.cc	2009-10-27 14:57:28 UTC (rev 11771)
@@ -29,7 +29,7 @@
 }
 
 const x10aux::serialization_id_t File__NativeFile::_serialization_id =
-    x10aux::DeserializationDispatcher::addDeserializer(File__NativeFile::_deserializer<Object>);
+    x10aux::DeserializationDispatcher::addDeserializer(File__NativeFile::_deserializer<Ref>);
 
 RTT_CC_DECLS1(File__NativeFile, "x10.io.File.NativeFile", Ref)
 

Modified: trunk/x10.runtime/src-cpp/x10/lang/Box.h
===================================================================
--- trunk/x10.runtime/src-cpp/x10/lang/Box.h	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10/lang/Box.h	2009-10-27 14:57:28 UTC (rev 11771)
@@ -59,7 +59,7 @@
         };
 
         template<class T> const x10aux::serialization_id_t Box<T>::_serialization_id =
-            x10aux::DeserializationDispatcher::addDeserializer(Box<T>::template _deserializer<Object>);
+            x10aux::DeserializationDispatcher::addDeserializer(Box<T>::template _deserializer<Ref>);
 
         template<class T> void Box<T>::_serialize_body(x10aux::serialization_buffer &buf, x10aux::addr_map &m) {
             this->x10::lang::Ref::_serialize_body(buf, m);

Modified: trunk/x10.runtime/src-cpp/x10/lang/Rail.h
===================================================================
--- trunk/x10.runtime/src-cpp/x10/lang/Rail.h	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10/lang/Rail.h	2009-10-27 14:57:28 UTC (rev 11771)
@@ -552,7 +552,7 @@
 
         template<class T> const x10aux::serialization_id_t Rail<T>::_serialization_id =
             x10aux::DeserializationDispatcher
-                ::addDeserializer(Rail<T>::template _deserializer<Object>);
+                ::addDeserializer(Rail<T>::template _deserializer<Ref>);
 
         // Specialized serialization
         template <class T> void Rail<T>::_serialize(x10aux::ref<Rail<T> > this_,

Modified: trunk/x10.runtime/src-cpp/x10/lang/Ref.cc
===================================================================
--- trunk/x10.runtime/src-cpp/x10/lang/Ref.cc	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10/lang/Ref.cc	2009-10-27 14:57:28 UTC (rev 11771)
@@ -29,8 +29,12 @@
     return String::Lit(alloc_printf("%s@%p",this->_type()->name(),(void*)this));
 }
 
+x10aux::ref<x10::lang::String> x10::lang::Ref::typeName() {
+    return x10::lang::String::Lit(_type()->name());
+}
+
 const serialization_id_t Ref::_serialization_id =
-    DeserializationDispatcher::addDeserializer(Ref::_deserializer<Object>);
+    DeserializationDispatcher::addDeserializer(Ref::_deserializer<Ref>);
 
 void Ref::_serialize(ref<Ref> this_, serialization_buffer &buf, addr_map &m)
 {

Modified: trunk/x10.runtime/src-cpp/x10/lang/Ref.h
===================================================================
--- trunk/x10.runtime/src-cpp/x10/lang/Ref.h	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10/lang/Ref.h	2009-10-27 14:57:28 UTC (rev 11771)
@@ -86,6 +86,8 @@
                 return location == o->location;
             }
 
+            virtual x10aux::ref<x10::lang::String> typeName();
+
             // Needed for linking - do not override
             virtual x10_boolean _struct_equals(x10aux::ref<Object> other) {
                 if (other == x10aux::ref<Ref>(this)) return true;

Modified: trunk/x10.runtime/src-cpp/x10/lang/String.cc
===================================================================
--- trunk/x10.runtime/src-cpp/x10/lang/String.cc	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10/lang/String.cc	2009-10-27 14:57:28 UTC (rev 11771)
@@ -165,7 +165,7 @@
 }
 
 // TODO: DG: itables: refactor to share the code.
-ref<String> String::format(ref<String> format, ref<ValRail<ref<Object> > > parms) {
+ref<String> String::format(ref<String> format, ref<ValRail<ref<Ref> > > parms) {
     std::ostringstream ss;
     nullCheck(format);
     char* fmt = const_cast<char*>(format->c_str());
@@ -223,7 +223,7 @@
     return String::Lit(ss.str().c_str());
 }
 
-ref<String> String::format(ref<String> format, ref<Rail<ref<Object> > > parms) {
+ref<String> String::format(ref<String> format, ref<Rail<ref<Ref> > > parms) {
     std::ostringstream ss;
     nullCheck(format);
     char* fmt = const_cast<char*>(format->c_str());
@@ -290,7 +290,7 @@
 }
 
 const serialization_id_t String::_serialization_id =
-    DeserializationDispatcher::addDeserializer(String::_deserializer<Object>);
+    DeserializationDispatcher::addDeserializer(String::_deserializer<Ref>);
 
 // Specialized serialization
 void String::_serialize(x10aux::ref<String> this_, x10aux::serialization_buffer &buf, x10aux::addr_map &m) {

Modified: trunk/x10.runtime/src-cpp/x10/lang/String.h
===================================================================
--- trunk/x10.runtime/src-cpp/x10/lang/String.h	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10/lang/String.h	2009-10-27 14:57:28 UTC (rev 11771)
@@ -114,10 +114,10 @@
             virtual void _destructor();
 
             static x10aux::ref<String> format(x10aux::ref<String> format,
-                                              x10aux::ref<ValRail<x10aux::ref<Object> > > parms);
+                                              x10aux::ref<ValRail<x10aux::ref<Ref> > > parms);
 
             static x10aux::ref<String> format(x10aux::ref<String> format,
-                                              x10aux::ref<Rail<x10aux::ref<Object> > > parms);
+                                              x10aux::ref<Rail<x10aux::ref<Ref> > > parms);
 
             virtual x10_boolean equals(x10aux::ref<x10::lang::Object> p0);
 

Modified: trunk/x10.runtime/src-cpp/x10/lang/Throwable.cc
===================================================================
--- trunk/x10.runtime/src-cpp/x10/lang/Throwable.cc	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10/lang/Throwable.cc	2009-10-27 14:57:28 UTC (rev 11771)
@@ -32,7 +32,7 @@
 using namespace x10aux;
 
 const serialization_id_t Throwable::_serialization_id =
-    DeserializationDispatcher::addDeserializer(Throwable::_deserializer<Object>);
+    DeserializationDispatcher::addDeserializer(Throwable::_deserializer<Ref>);
 
 void
 Throwable::_serialize_body(x10aux::serialization_buffer &buf, x10aux::addr_map &m) {

Modified: trunk/x10.runtime/src-cpp/x10/lang/ValRail.h
===================================================================
--- trunk/x10.runtime/src-cpp/x10/lang/ValRail.h	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10/lang/ValRail.h	2009-10-27 14:57:28 UTC (rev 11771)
@@ -98,7 +98,7 @@
 
         template<class T> const x10aux::serialization_id_t ValRail<T>::_serialization_id =
             x10aux::DeserializationDispatcher
-                ::addDeserializer(ValRail<T>::template _deserializer<Object>);
+                ::addDeserializer(ValRail<T>::template _deserializer<Ref>);
 
         template<class T> void ValRail<T>::_initRTT() {
             rtt.canonical = &rtt;

Modified: trunk/x10.runtime/src-cpp/x10/lang/Value.cc
===================================================================
--- trunk/x10.runtime/src-cpp/x10/lang/Value.cc	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10/lang/Value.cc	2009-10-27 14:57:28 UTC (rev 11771)
@@ -10,7 +10,7 @@
 using namespace x10aux;
 
 const serialization_id_t Value::_serialization_id =
-    DeserializationDispatcher::addDeserializer(Value::_deserializer<Object>);
+    DeserializationDispatcher::addDeserializer(Value::_deserializer<Ref>);
 
 void Value::_serialize(x10aux::ref<Value> this_,
                        x10aux::serialization_buffer &buf,

Modified: trunk/x10.runtime/src-cpp/x10/runtime/Deque.cc
===================================================================
--- trunk/x10.runtime/src-cpp/x10/runtime/Deque.cc	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10/runtime/Deque.cc	2009-10-27 14:57:28 UTC (rev 11771)
@@ -37,7 +37,7 @@
 }
 
 const serialization_id_t Deque::_serialization_id =
-    DeserializationDispatcher::addDeserializer(Deque::_deserializer<Object>);
+    DeserializationDispatcher::addDeserializer(Deque::_deserializer<Ref>);
 
 void Deque::growQueue() {
     Slots *oldQ = queue;

Modified: trunk/x10.runtime/src-cpp/x10/runtime/Thread.cc
===================================================================
--- trunk/x10.runtime/src-cpp/x10/runtime/Thread.cc	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10/runtime/Thread.cc	2009-10-27 14:57:28 UTC (rev 11771)
@@ -83,7 +83,7 @@
 }
 
 const serialization_id_t Thread::_serialization_id =
-    DeserializationDispatcher::addDeserializer(Thread::_deserializer<Object>);
+    DeserializationDispatcher::addDeserializer(Thread::_deserializer<Ref>);
 
 
 // Helper method to initialize a Thread object.

Modified: trunk/x10.runtime/src-cpp/x10/util/GrowableRail.h
===================================================================
--- trunk/x10.runtime/src-cpp/x10/util/GrowableRail.h	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10/util/GrowableRail.h	2009-10-27 14:57:28 UTC (rev 11771)
@@ -197,7 +197,7 @@
         }
 
         template<class T> const x10aux::serialization_id_t GrowableRail<T>::_serialization_id =
-            x10aux::DeserializationDispatcher::addDeserializer(GrowableRail<T>::template _deserializer<Object>);
+            x10aux::DeserializationDispatcher::addDeserializer(GrowableRail<T>::template _deserializer<Ref>);
 
         template<> class GrowableRail<void> {
         public:

Modified: trunk/x10.runtime/src-cpp/x10/util/concurrent/atomic/AtomicBoolean.cc
===================================================================
--- trunk/x10.runtime/src-cpp/x10/util/concurrent/atomic/AtomicBoolean.cc	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10/util/concurrent/atomic/AtomicBoolean.cc	2009-10-27 14:57:28 UTC (rev 11771)
@@ -32,7 +32,7 @@
 }
 
 const x10aux::serialization_id_t AtomicBoolean::_serialization_id =
-    x10aux::DeserializationDispatcher::addDeserializer(AtomicBoolean::_deserializer<Object>);
+    x10aux::DeserializationDispatcher::addDeserializer(AtomicBoolean::_deserializer<Ref>);
 
 RTT_CC_DECLS1(AtomicBoolean, "x10.util.concurrent.atomic.AtomicBoolean", Ref)
 

Modified: trunk/x10.runtime/src-cpp/x10/util/concurrent/atomic/AtomicInteger.cc
===================================================================
--- trunk/x10.runtime/src-cpp/x10/util/concurrent/atomic/AtomicInteger.cc	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10/util/concurrent/atomic/AtomicInteger.cc	2009-10-27 14:57:28 UTC (rev 11771)
@@ -32,7 +32,7 @@
 }
 
 const x10aux::serialization_id_t AtomicInteger::_serialization_id =
-    x10aux::DeserializationDispatcher::addDeserializer(AtomicInteger::_deserializer<Object>);
+    x10aux::DeserializationDispatcher::addDeserializer(AtomicInteger::_deserializer<Ref>);
 
 RTT_CC_DECLS1(AtomicInteger, "x10.util.concurrent.atomic.AtomicInteger", Ref)
 

Modified: trunk/x10.runtime/src-cpp/x10/util/concurrent/atomic/AtomicLong.cc
===================================================================
--- trunk/x10.runtime/src-cpp/x10/util/concurrent/atomic/AtomicLong.cc	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10/util/concurrent/atomic/AtomicLong.cc	2009-10-27 14:57:28 UTC (rev 11771)
@@ -32,7 +32,7 @@
 }
 
 const x10aux::serialization_id_t AtomicLong::_serialization_id =
-    x10aux::DeserializationDispatcher::addDeserializer(AtomicLong::_deserializer<Object>);
+    x10aux::DeserializationDispatcher::addDeserializer(AtomicLong::_deserializer<Ref>);
 
 RTT_CC_DECLS1(AtomicLong, "x10.util.concurrent.atomic.AtomicLong", Ref)
 

Modified: trunk/x10.runtime/src-cpp/x10aux/deserialization_dispatcher.cc
===================================================================
--- trunk/x10.runtime/src-cpp/x10aux/deserialization_dispatcher.cc	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10aux/deserialization_dispatcher.cc	2009-10-27 14:57:28 UTC (rev 11771)
@@ -140,12 +140,12 @@
 }
 
 
-ref<Object> DeserializationDispatcher::create_(deserialization_buffer &buf, serialization_id_t id) {
+ref<Ref> DeserializationDispatcher::create_(deserialization_buffer &buf, serialization_id_t id) {
     _S_("Dispatching deserialisation using id: "<<id);
     return deser_v[id](buf);
 }
 
-ref<Object> DeserializationDispatcher::create_(deserialization_buffer &buf) {
+ref<Ref> DeserializationDispatcher::create_(deserialization_buffer &buf) {
     serialization_id_t id = buf.read<serialization_id_t>();
     return create_(buf, id);
 }

Modified: trunk/x10.runtime/src-cpp/x10aux/deserialization_dispatcher.h
===================================================================
--- trunk/x10.runtime/src-cpp/x10aux/deserialization_dispatcher.h	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10aux/deserialization_dispatcher.h	2009-10-27 14:57:28 UTC (rev 11771)
@@ -5,13 +5,13 @@
 
 #include <x10aux/ref.h>
 
-namespace x10 { namespace lang { class Object; } }
+namespace x10 { namespace lang { class Ref; } }
 
 namespace x10aux {
 
     class deserialization_buffer;
 
-    typedef ref<x10::lang::Object> (*Deserializer)(deserialization_buffer &buf);
+    typedef ref<x10::lang::Ref> (*Deserializer)(deserialization_buffer &buf);
     template<> inline const char *typeName<Deserializer>() { return "Deserializer"; }
 
     typedef void *(*BufferFinder)(deserialization_buffer &buf, x10_int len);
@@ -57,8 +57,8 @@
         template<class T> static ref<T> create(deserialization_buffer &buf,
                                                serialization_id_t id);
 
-        ref<x10::lang::Object> create_(deserialization_buffer &buf);
-        ref<x10::lang::Object> create_(deserialization_buffer &buf, serialization_id_t id);
+        ref<x10::lang::Ref> create_(deserialization_buffer &buf);
+        ref<x10::lang::Ref> create_(deserialization_buffer &buf, serialization_id_t id);
 
         static serialization_id_t addDeserializer(Deserializer deser, bool is_async=false);
         serialization_id_t addDeserializer_(Deserializer deser, bool is_async);

Modified: trunk/x10.runtime/src-cpp/x10aux/static_init.cc
===================================================================
--- trunk/x10.runtime/src-cpp/x10aux/static_init.cc	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10aux/static_init.cc	2009-10-27 14:57:28 UTC (rev 11771)
@@ -20,7 +20,7 @@
     return it->addDeserializer_(init, false);
 }
 
-ref<Object> StaticInitBroadcastDispatcher::dispatch(deserialization_buffer &buf) {
+ref<Ref> StaticInitBroadcastDispatcher::dispatch(deserialization_buffer &buf) {
     assert (NULL != it);
     serialization_id_t init_id = buf.read<serialization_id_t>();
     return it->create_(buf, init_id);

Modified: trunk/x10.runtime/src-cpp/x10aux/static_init.h
===================================================================
--- trunk/x10.runtime/src-cpp/x10aux/static_init.h	2009-10-27 11:41:48 UTC (rev 11770)
+++ trunk/x10.runtime/src-cpp/x10aux/static_init.h	2009-10-27 14:57:28 UTC (rev 11771)
@@ -17,7 +17,7 @@
 
         public:
         static serialization_id_t addRoutine(Deserializer init);
-        static ref<x10::lang::Object> dispatch(deserialization_buffer& buf);
+        static ref<x10::lang::Ref> dispatch(deserialization_buffer& buf);
         template<class C> static void broadcastStaticField(C f, serialization_id_t id);
         static void await();
         static void notify();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [X10-commits] SF.net SVN: x10:[11771] trunk (Page 9)

Performance and Productivity at Scale

x10-commits