new CTask for debugging on Linux

direct/metalibs/direct/Sources.pp

@@ -8,7 +8,7 @@
 #define BUILDING_DLL BUILDING_DIRECT
 
 #define COMPONENT_LIBS \
-  directbase dcparser showbase deadrec directd interval distributed
+  directbase dcparser showbase deadrec directd interval distributed task
 
 #define OTHER_LIBS \
   panda:m \

direct/src/distributed/DistributedSmoothNodeBase.py

@@ -108,16 +108,16 @@ class DistributedSmoothNodeBase:
         if stagger:
             delay = randFloat(period)
         taskMgr.doMethodLater(self.__broadcastPeriod + delay,
-                              self.posHprBroadcast, taskName)
+                              self.__posHprBroadcast, taskName)
 
-    def posHprBroadcast(self, task):
+    def __posHprBroadcast(self, task):
         # TODO: we explicitly stagger the initial task timing in
         # startPosHprBroadcast; we should at least make an effort to keep
         # this task accurately aligned with its period and starting time.
         self.d_broadcastPosHpr()
         taskName = self.taskName("sendPosHpr")
         taskMgr.doMethodLater(self.__broadcastPeriod,
-                              self.posHprBroadcast, taskName)
+                              self.__posHprBroadcast, taskName)
         return Task.done
 
     def d_broadcastPosHpr_FULL(self):

direct/src/heapq/Sources.pp

@@ -7,9 +7,18 @@
 #define DIR_TYPE metalib
 #define BUILDING_DLL BUILDING_DIRECT
 
+
+#define OTHER_LIBS \
+  pandaexpress:m \
+  dconfig:c dtoolconfig:m \
+  dtoolutil:c dtoolbase:c dtool:m
+
 #begin metalib_target
   #define TARGET heapq
 
-  #define SOURCES heapq.c
+  #define LOCAL_LIBS \
+    task
+
+  #define SOURCES heapq.cxx
 #end metalib_target
 

direct/src/heapq/heapq.c → direct/src/heapq/heapq.cxx

@@ -7,6 +7,7 @@
 */
 
 #include <Python.h>
+#include "cTask.h"
 
 /* Prototypes */
 static PyObject * heappush(PyObject *self, PyObject *args);
@@ -124,15 +125,36 @@ _siftdown(PyObject *list, int startpos, int pos) {
     int parentpos, cmp;
 
     newitem = PySequence_GetItem(list,pos);
+
+    PyObject *newitemCTask_this = PyObject_GetAttrString(newitem, "this");
+    nassertr(newitemCTask_this != NULL, false);    
+    CTask *newitemCTask = (CTask *)PyInt_AsLong(newitemCTask_this);
+    Py_DECREF(newitemCTask_this);
+
     while (pos > startpos) {
         parentpos = (pos - 1) >> 1;
         parent = PyList_GetItem(list,parentpos);
 
+        /*
         cmp = PyObject_RichCompareBool(parent,newitem,Py_LE);
         if (cmp > 0)
             break;
         else if (cmp < 0)
             return -1;
+        */
+
+        PyObject *parentCTask_this = PyObject_GetAttrString(parent, "this");
+        nassertr(parentCTask_this != NULL, false);        
+        CTask *parentCTask = (CTask *)PyInt_AsLong(parentCTask_this);
+        Py_DECREF(parentCTask_this);
+
+        if (parentCTask->get_wake_time() <= newitemCTask->get_wake_time()) {
+          break;
+        } else {
+          return -1;
+        }
+
+
         Py_INCREF(parent);
         PyList_SetItem(list,pos,parent);
         pos = parentpos;
@@ -155,13 +177,34 @@ _siftup(PyObject *list, int pos) {
     while (childpos < endpos) {
         rightpos = childpos + 1;
         child = PySequence_Fast_GET_ITEM(list,childpos);
+
+        PyObject *childCTask_this = PyObject_GetAttrString(child, "this");
+        nassertr(childCTask_this != NULL, false);        
+        CTask *childCTask = (CTask *)PyInt_AsLong(childCTask_this);
+        Py_DECREF(childCTask_this);
+
+
         if (rightpos < endpos) {
             right = PySequence_Fast_GET_ITEM(list,rightpos);
+
+            PyObject *rightCTask_this = PyObject_GetAttrString(right, "this");
+            nassertr(rightCTask_this != NULL, false);    
+            CTask *rightCTask = (CTask *)PyInt_AsLong(rightCTask_this);
+            Py_DECREF(rightCTask_this);
+
+            /*
             cmp = PyObject_RichCompareBool(right,child,Py_LE);
             if (cmp > 0)
-                childpos = rightpos;
+              childpos = rightpos;
             else if (cmp < 0)
-                return -1;
+              return -1;
+            */
+
+            if (rightCTask->get_wake_time() <= childCTask->get_wake_time()) {
+              childpos = rightpos;
+            } else {
+              return -1;
+            }
         }
         child = PySequence_GetItem(list,childpos);
         PyList_SetItem(list,pos,child);

direct/src/task/Sources.pp

@@ -0,0 +1,17 @@
+#begin lib_target
+  #define TARGET task
+  #define LOCAL_LIBS \
+    directbase
+  #define OTHER_LIBS \
+    panda
+
+  #define SOURCES \
+    config_task.cxx config_task.h \
+    cTask.h cTask.I cTask.cxx
+
+  #define INSTALL_HEADERS \
+    config_task.h \
+    cTask.h cTask.I
+
+  #define IGATESCAN all
+#end lib_target

direct/src/task/Task.py

@@ -5,7 +5,8 @@
 # subset of PandaModules that we know is available immediately.
 # Methods that require more advanced C++ methods may import the
 # appropriate files within their own scope.
-from pandac.libpandaexpressModules import *
+# from pandac.libpandaexpressModules import *
+from pandac.libdirectModules import *
 
 from direct.directnotify.DirectNotifyGlobal import *
 from direct.showbase.PythonUtil import *
@@ -63,9 +64,14 @@ def print_exc_plus():
             except:
                 print "<ERROR WHILE PRINTING VALUE>"
 
-class Task:
+# Here we inherit from CTask so that we can drop the expensive work
+# that the task does down into C++. The main reason to do this is
+# to move the compare operator for the heapq data structure.
+
+class Task(CTask):
     count = 0
     def __init__(self, callback, priority = 0):
+        CTask.__init__(self)
         # Unique ID for each task
         self.id = Task.count
         Task.count += 1
@@ -79,16 +85,14 @@ class Task:
             self.runningTotal = 0.0
             self.pstats = None
         self.extraArgs = None
-        # Used for doLaters
-        self.wakeTime = 0.0
 
     # Used for putting into the doLaterList
     # the heapq calls __cmp__ via the rich compare function
     def __cmp__(self, other):
         if isinstance(other, Task):
-            if self.wakeTime < other.wakeTime:
+            if self.getWakeTime() < other.getWakeTime():
                 return -1
-            elif self.wakeTime > other.wakeTime:
+            elif self.getWakeTime() > other.getWakeTime():
                 return 1
             # If the wakeTimes happen to be the same, just
             # sort them based on id
@@ -386,7 +390,7 @@ class TaskManager:
                 continue
             # If the time now is less than the start of the doLater + delay
             # then we are not ready yet, continue to next one
-            elif task.time < dl.wakeTime:
+            elif task.time < dl.getWakeTime():
                 # Since the list is sorted, the first one we get to, that
                 # is not ready to go, we can return
                 break
@@ -423,7 +427,7 @@ class TaskManager:
         # have been synced since the start of this frame
         currentTime = globalClock.getFrameTime()
         # Cache the time we should wake up for easier sorting
-        task.wakeTime = currentTime + delayTime
+        task.setWakeTime(currentTime + delayTime)
         # Push this onto the doLaterList. The heap maintains the sorting.
         heappush(self.__doLaterList, task)
         if self.fVerbose:
@@ -853,7 +857,7 @@ class TaskManager:
         sortedDoLaterList.sort()
         sortedDoLaterList.reverse()
         for task in sortedDoLaterList:
-            remainingTime = ((task.wakeTime) - self.currentTime)
+            remainingTime = ((task.getWakeTime()) - self.currentTime)
             if task.isRemoved():
                 taskName = '(R)' + task.name
             else:

direct/src/task/cTask.I

@@ -0,0 +1,38 @@
+// Filename: cTask.I
+// Created by:  Administrator (03Sep04)
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://etc.cmu.edu/panda3d/docs/license/ .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
+////////////////////////////////////////////////////////////////////
+
+
+////////////////////////////////////////////////////////////////////
+//     Function: CTask::set_wake_time
+//       Access: Published
+//  Description: Sets the wake time of this task (for doLaters)
+////////////////////////////////////////////////////////////////////
+INLINE void CTask::
+set_wake_time(float wake_time) {
+  _wake_time = wake_time;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: CTask::get_wake_time
+//       Access: Published
+//  Description: Returns wake time of this task (for doLaters)
+////////////////////////////////////////////////////////////////////
+INLINE float CTask::
+get_wake_time() const {
+  return _wake_time;
+}

direct/src/task/cTask.cxx

@@ -0,0 +1,31 @@
+// Filename: cTask.cxx
+// Created by:  Administrator (03Sep04)
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://etc.cmu.edu/panda3d/docs/license/ .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
+////////////////////////////////////////////////////////////////////
+
+
+#include "cTask.h"
+
+TypeHandle CTask::_type_handle;
+
+CTask::
+CTask() {
+  _wake_time = 0.0;
+}
+
+CTask::
+~CTask() {
+}

direct/src/task/cTask.h

@@ -0,0 +1,59 @@
+// Filename: cTask.h
+// Created by:  Shochet (03Sep04)
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://etc.cmu.edu/panda3d/docs/license/ .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
+////////////////////////////////////////////////////////////////////
+
+
+#ifndef CTASK_H
+#define CTASK_H
+
+#include "directbase.h"
+#include "typedReferenceCount.h"
+#include "config_task.h"
+
+
+class EXPCL_DIRECT CTask : public TypedReferenceCount {
+PUBLISHED:
+  CTask();
+  ~CTask();
+
+  INLINE void set_wake_time(float wake_time);
+  INLINE float get_wake_time() const;
+
+public:
+  static TypeHandle get_class_type() {
+    return _type_handle;
+  }
+  static void init_type() {
+    TypedReferenceCount::init_type();
+    register_type(_type_handle, "CTask",
+                  TypedReferenceCount::get_class_type());
+  }
+  virtual TypeHandle get_type() const {
+    return get_class_type();
+  }
+  virtual TypeHandle force_init_type() {init_type(); return get_class_type();}
+
+private:
+
+  float _wake_time;
+
+  static TypeHandle _type_handle;
+};
+
+#include "cTask.I"
+
+#endif

direct/src/task/config_task.cxx

@@ -0,0 +1,49 @@
+// Filename: config_task.cxx
+// Created by:  Administrator (03Sep04)
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://etc.cmu.edu/panda3d/docs/license/ .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
+////////////////////////////////////////////////////////////////////
+
+
+#include "config_task.h"
+#include "cTask.h"
+
+#include "dconfig.h"
+
+Configure(config_task);
+NotifyCategoryDef(task, "");
+
+ConfigureFn(config_task) {
+  init_libtask();
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: init_libtask
+//  Description: Initializes the library.  This must be called at
+//               least once before any of the functions or classes in
+//               this library can be used.  Normally it will be
+//               called by the static initializers and need not be
+//               called explicitly, but special cases exist.
+////////////////////////////////////////////////////////////////////
+void
+init_libtask() {
+  static bool initialized = false;
+  if (initialized) {
+    return;
+  }
+  initialized = true;
+
+  CTask::init_type();
+}

direct/src/task/config_task.h

@@ -0,0 +1,30 @@
+// Filename: config_task.h
+// Created by:  Shochet (03Sep04)
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://etc.cmu.edu/panda3d/docs/license/ .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
+////////////////////////////////////////////////////////////////////
+
+#ifndef CONFIG_TASK_H
+#define CONFIG_TASK_H
+
+#include "directbase.h"
+#include "notifyCategoryProxy.h"
+#include "dconfig.h"
+
+NotifyCategoryDecl(task, EXPCL_DIRECT, EXPTP_DIRECT);
+
+extern EXPCL_DIRECT void init_libtask();
+
+#endif