From f0aa2fe0e06df2a8a47359e50513b001555d7a5f Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@bnl.gov>
Date: Wed, 1 May 2013 12:17:58 -0400
Subject: [PATCH] fix printer

Don't overflow the stack for deep structures!
---
 pvDataApp/factory/printer.cpp | 91 ++++++++++++++++++++++++++---------
 pvDataApp/pv/printer.h        |  2 -
 2 files changed, 68 insertions(+), 25 deletions(-)

diff --git a/pvDataApp/factory/printer.cpp b/pvDataApp/factory/printer.cpp
index 648812d..baf6c8a 100644
--- a/pvDataApp/factory/printer.cpp
+++ b/pvDataApp/factory/printer.cpp
@@ -1,4 +1,6 @@
 
+#include <deque>
+
 #include "pv/printer.h"
 
 namespace {
@@ -46,36 +48,79 @@ void PrinterBase::encodeScalar(const PVScalar& pv) {}
 
 void PrinterBase::encodeArray(const PVScalarArray&) {}
 
-void PrinterBase::abortField(const PVField&) {}
-
 void PrinterBase::impl_print(const PVField& pv)
 {
-    try {
-        switch(pv.getField()->getType()) {
-        case scalar: encodeScalar(static_cast<const PVScalar&>(pv)); return;
-        case scalarArray: encodeArray(static_cast<const PVScalarArray&>(pv)); return;
-        case structure: {
-                const PVStructure &fld = static_cast<const PVStructure&>(pv);
-                const PVFieldPtrArray& vals = fld.getPVFields();
+    /* Depth first recursive iteration.
+     * Each PV to be printed is appended to the todo queue.
+     * The last child of a structure is followed by a NULL.
+     * As the tree is walked structures and structarrays
+     * are appended to the inprog queue.
+     */
+    std::deque<const PVField*> todo, inprog;
 
-                beginStructure(fld);
-                for(size_t i=0, nfld=fld.getStructure()->getNumberFields(); i<nfld; i++)
-                    this->print(*vals[i]);
-                endStructure(fld);
+    todo.push_back(&pv);
+
+    while(!todo.empty()) {
+        const PVField *next = todo.front();
+        todo.pop_front();
+
+        if(!next) {
+            // finished with a structure or structarray,
+            // now we fall back to its parent.
+            assert(!inprog.empty());
+            switch(inprog.back()->getField()->getType()) {
+            case structure:
+                endStructure(*static_cast<const PVStructure *>(inprog.back()));
+                break;
+
+            case structureArray:
+                endStructureArray(*static_cast<const PVStructureArray *>(inprog.back()));
+                break;
+
+            default:
+                assert(false); // oops!
+                return;
             }
-        case structureArray: {
-                const PVStructureArray &fld = static_cast<const PVStructureArray&>(pv);
-                const PVStructureArray::pointer vals = fld.get();
+            inprog.pop_back();
 
-                beginStructureArray(fld);
-                for(size_t i=0, nfld=fld.getLength(); i<nfld; i++)
-                    this->print(*vals[i]);
-                endStructureArray(fld);
+        } else {
+            // real field
+
+            switch(next->getField()->getType()) {
+            case scalar:
+                encodeScalar(*static_cast<const PVScalar*>(next));
+                break;
+            case scalarArray:
+                encodeArray(*static_cast<const PVScalarArray*>(next));
+                break;
+            case structure: {
+                    const PVStructure &fld = *static_cast<const PVStructure*>(next);
+                    const PVFieldPtrArray& vals = fld.getPVFields();
+
+                    inprog.push_back(next);
+
+                    beginStructure(fld);
+                    for(size_t i=0, nfld=fld.getStructure()->getNumberFields(); i<nfld; i++)
+                        todo.push_back(vals[i].get());
+
+                    todo.push_back(NULL);
+                    break;
+                }
+            case structureArray: {
+                    const PVStructureArray &fld = *static_cast<const PVStructureArray*>(next);
+                    const PVStructureArray::pointer vals = fld.get();
+
+                    inprog.push_back(next);
+
+                    beginStructureArray(fld);
+                    for(size_t i=0, nfld=fld.getLength(); i<nfld; i++)
+                        todo.push_back(vals[i].get());
+
+                    todo.push_back(NULL);
+                    break;
+                }
             }
         }
-    } catch(...) {
-        abortField(pv);
-        throw;
     }
 }
 
diff --git a/pvDataApp/pv/printer.h b/pvDataApp/pv/printer.h
index 4693c77..115b052 100644
--- a/pvDataApp/pv/printer.h
+++ b/pvDataApp/pv/printer.h
@@ -28,8 +28,6 @@ protected:
     virtual void encodeScalar(const PVScalar&);
     virtual void encodeArray(const PVScalarArray&);
 
-    virtual void abortField(const PVField&);
-
     inline std::ostream& S() { return *strm; }
 
     void impl_print(const PVField&);