[Gnash-commit] gnash ChangeLog testsuite/libamf.all/.cvsignore...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/04/06 18:11:34

Modified files:
        .              : ChangeLog 
        testsuite/libamf.all: .cvsignore Makefile.am test_el.cpp 
                              test_object.cpp test_sol.cpp 
        testsuite/libnet.all: Makefile.am test_cque.cpp test_handler.cpp 
        libamf         : amf.cpp element.cpp sol.cpp 
        libnet         : cque.cpp cque.h 

Log message:
                * testsuite/libamf.all/test_el.cpp: Use new make* methods for
                constructing elements.
                * libamf/element.cpp: Apply strk's patch for initializing 
private
                data.
                * libnet/cque.{h,cpp}: Apply part of strk's patch for merging
                buffers.
                * libamf/sol.cpp: Copy a buffer by it's reference(), not it's 
base
                address.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6190&r2=1.6191
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/.cvsignore?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/Makefile.am?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_el.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_object.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_sol.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libnet.all/Makefile.am?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libnet.all/test_cque.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libnet.all/test_handler.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/element.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/sol.cpp?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/cque.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/cque.h?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6190
retrieving revision 1.6191
diff -u -b -r1.6190 -r1.6191
--- ChangeLog   6 Apr 2008 17:48:30 -0000       1.6190
+++ ChangeLog   6 Apr 2008 18:11:32 -0000       1.6191
@@ -1,3 +1,14 @@
+2008-04-06  Rob Savoye  <address@hidden>
+
+       * testsuite/libamf.all/test_el.cpp: Use new make* methods for
+       constructing elements.
+       * libamf/element.cpp: Apply strk's patch for initializing private
+       data.
+       * libnet/cque.{h,cpp}: Apply part of strk's patch for merging
+       buffers.
+       * libamf/sol.cpp: Copy a buffer by it's reference(), not it's base
+       address.
+
 2008-04-06 Benjamin Wolsey <address@hidden>
 
        * libbase/tu_timer.{cpp,h}: drop, functions moved to Time.{cpp,h}.

Index: testsuite/libamf.all/.cvsignore
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/libamf.all/.cvsignore     4 May 2007 09:49:00 -0000       1.2
+++ testsuite/libamf.all/.cvsignore     6 Apr 2008 18:11:33 -0000       1.3
@@ -11,3 +11,4 @@
 testrun.log
 testrun.sum
 gmon.out
+xmlfiles

Index: testsuite/libamf.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20

Index: testsuite/libamf.all/test_el.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/test_el.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/libamf.all/test_el.cpp    21 Jan 2008 23:26:49 -0000      1.3
+++ testsuite/libamf.all/test_el.cpp    6 Apr 2008 18:11:33 -0000       1.4
@@ -46,6 +46,8 @@
 
 #include "dejagnu.h"
 
+#include "buffer.h"
+#include "network.h"
 #include "amf.h"
 #include "element.h"
 
@@ -100,11 +102,11 @@
         runtest.fail("Created double element");
     }
 
-    el.dump();
+//    el.dump();
     el.clear();
     
     string str = "Hello World!";
-    el.init(str);
+    el.makeString("Hello World!");
     if ((el.getType() == Element::STRING) &&
         (el.to_string() == str)) {
         runtest.pass("Created string element");
@@ -114,7 +116,7 @@
 
     el.clear();
     bool sheet = true;
-    el.init(sheet);
+    el.makeBoolean(sheet);
     if ((el.getType() == Element::BOOLEAN) &&
         (el.to_bool() == sheet)) {
         runtest.pass("Created bool element");
@@ -136,7 +138,6 @@
     } else {
         runtest.fail("Created Undefined element");
     }
-
 }
 
 static void

Index: testsuite/libamf.all/test_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/test_object.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- testsuite/libamf.all/test_object.cpp        5 Mar 2008 18:49:39 -0000       
1.14
+++ testsuite/libamf.all/test_object.cpp        6 Apr 2008 18:11:33 -0000       
1.15
@@ -19,8 +19,8 @@
 #include "gnashconfig.h"
 #endif
 
-#ifdef HAVE_DEJAGNU_H
-
+//#ifdef HAVE_DEJAGNU_H
+#if 1
 #include <sys/types.h>
 extern "C"{
 #include <unistd.h>
@@ -34,12 +34,12 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <log.h>
 #include <string>
 #include <iostream>
 #include <string>
 
-//#include "dejagnu.h"
+#include "log.h"
+#include "dejagnu.h"
 #include "rtmp.h"
 #include "amf.h"
 #include "check.h"

Index: testsuite/libamf.all/test_sol.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/test_sol.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/libamf.all/test_sol.cpp   5 Apr 2008 21:36:34 -0000       1.9
+++ testsuite/libamf.all/test_sol.cpp   6 Apr 2008 18:11:33 -0000       1.10
@@ -331,7 +331,7 @@
     } else {
         runtest.fail("localSecPathTime set");
     }
-    sol.dump();
+//    sol.dump();
     // now write the data to disk
     sol.writeFile(filespec, "settings");
 }

Index: testsuite/libnet.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libnet.all/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/libnet.all/Makefile.am    1 Apr 2008 23:39:12 -0000       1.4
+++ testsuite/libnet.all/Makefile.am    6 Apr 2008 18:11:33 -0000       1.5
@@ -34,6 +34,7 @@
 
 INCLUDES = -I.. \
         -I$(top_srcdir)        \
+        -I$(top_srcdir)/testsuite \
         -I$(top_srcdir)/libnet \
         -I$(top_srcdir)/libamf \
         -I$(top_srcdir)/libbase \

Index: testsuite/libnet.all/test_cque.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libnet.all/test_cque.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/libnet.all/test_cque.cpp  1 Apr 2008 23:39:12 -0000       1.2
+++ testsuite/libnet.all/test_cque.cpp  6 Apr 2008 18:11:33 -0000       1.3
@@ -45,10 +45,12 @@
 #endif
 
 #include "log.h"
+#include "buffer.h"
 #include "network.h"
 #include "cque.h"
 #include "amf.h"
 
+using namespace amf;
 using namespace std;
 using namespace gnash;
 using namespace boost;
@@ -160,6 +162,6 @@
 
      que.pop();
      
-     que.dump();
+//     que.dump();
 }
 

Index: testsuite/libnet.all/test_handler.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libnet.all/test_handler.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/libnet.all/test_handler.cpp       1 Apr 2008 23:39:12 -0000       
1.2
+++ testsuite/libnet.all/test_handler.cpp       6 Apr 2008 18:11:33 -0000       
1.3
@@ -45,9 +45,11 @@
 #endif
 
 #include "log.h"
+#include "buffer.h"
 #include "handler.h"
 #include "amf.h"
 
+using namespace amf;
 using namespace std;
 using namespace gnash;
 using namespace boost;

Index: libamf/amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- libamf/amf.cpp      5 Apr 2008 20:39:39 -0000       1.68
+++ libamf/amf.cpp      6 Apr 2008 18:11:33 -0000       1.69
@@ -1240,7 +1240,7 @@
     Element::amf_type_e type = static_cast<Element::amf_type_e>(c);
     tmpptr++;
     if (type != Element::TYPED_OBJECT) {
-        log_debug(_("AMF type is: %s"), amftype_str[(int)type]);
+//        log_debug(_("AMF type is: %s"), amftype_str[(int)type]);
        el->setType(type);
     }
 
@@ -1315,7 +1315,7 @@
 
     // Calculate the offset for the next read
     _totalsize = (tmpptr - in) + 1;
-    log_debug("Total number of bytes read from byte stream is: %d", 
_totalsize);
+//    log_debug("Total number of bytes read from byte stream is: %d", 
_totalsize);
     
     return el;
 }

Index: libamf/element.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/element.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- libamf/element.cpp  5 Apr 2008 20:39:39 -0000       1.15
+++ libamf/element.cpp  6 Apr 2008 18:11:34 -0000       1.16
@@ -63,7 +63,7 @@
 };
 
 Element::Element()
-    : _name(0),
+    : _name(),
       _buffer(0),
       _type(Element::NOTYPE)
 {
@@ -85,7 +85,7 @@
 }
 
 Element::Element(Network::byte_t *indata) 
-    : _name(0),
+    : _name(),
       _buffer(0),
       _type(Element::NOTYPE)
 {
@@ -94,7 +94,7 @@
 }
 
 Element::Element(double indata)
-    : _name(0),
+    : _name(),
       _buffer(0),
       _type(Element::NOTYPE)
 {
@@ -109,7 +109,7 @@
 // }
 
 Element::Element(const string &indata)
-    : _name(0),
+    : _name(),
       _buffer(0),
     _type(Element::NOTYPE)
 {
@@ -118,7 +118,7 @@
 }
 
 Element::Element(const string &name, const string &indata)
-    : _name(0),
+    : _name(),
       _buffer(0),
       _type(Element::NOTYPE)
 {
@@ -127,7 +127,7 @@
 }
 
 Element::Element(const string &name, bool indata)
-    : _name(0),
+    : _name(),
       _buffer(0),
       _type(Element::NOTYPE)
 {
@@ -136,7 +136,7 @@
 }
 
 Element::Element(bool indata)
-    : _name(0),
+    : _name(),
       _buffer(0),
       _type(Element::NOTYPE)
 {
@@ -147,7 +147,7 @@
 // Create a function block for AMF
 Element::Element(bool flag, double unknown1, double unknown2,
                 const string &methodname)
-    : _name(0),
+    : _name(),
       _buffer(0),
       _type(Element::NOTYPE)
 {
@@ -642,9 +642,15 @@
 Element::setName(Network::byte_t *name, size_t size)
 {
 //    GNASH_REPORT_FUNCTION;
+    if ((size > 0) && (name != 0)) {
+       if (isascii(*name)) {
     _name = new char[size+1];
     std::copy(name, name+size, _name);
     *(_name + size) = 0;
+       } else {
+           log_debug("Got unprintable characters for the element name!");
+       }
+    }
 }
 
 void

Index: libamf/sol.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/sol.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- libamf/sol.cpp      5 Apr 2008 20:39:39 -0000       1.31
+++ libamf/sol.cpp      6 Apr 2008 18:11:34 -0000       1.32
@@ -240,7 +240,7 @@
 
     for (ita = _amfobjs.begin(); ita != _amfobjs.end(); ita++) {
         amf::Element *el = (*(ita));
-        const Buffer *var = amf_obj.encodeVariable(el); 
+        Buffer *var = amf_obj.encodeVariable(el); 
         //  Network::byte_t *var = amf_obj.encodeVariable(el, outsize); 
         if (!var) {
             continue;
@@ -249,14 +249,14 @@
         switch (el->getType()) {
          case Element::BOOLEAN:
              outsize = el->getNameSize() + AMF_VAR_HEADER_SIZE;
-             memcpy(ptr, var, outsize); 
+             memcpy(ptr, var->reference(), outsize); 
              ptr += outsize;
              break;
          case Element::OBJECT:
              outsize = el->getNameSize() + 5;
               assert(ptr+outsize < endPtr);
              outsize = el->getNameSize() + 5;
-             memcpy(ptr, var, outsize);
+             memcpy(ptr, var->reference(), outsize);
              ptr += outsize;
              *ptr++ = Element::OBJECT_END;
              *ptr++ = 0;       // objects are terminated too!
@@ -264,7 +264,7 @@
          case Element::NUMBER:
              outsize = el->getNameSize() + AMF_NUMBER_SIZE + 2;
               assert(ptr+outsize < endPtr);
-             memcpy(ptr, var, outsize);
+             memcpy(ptr, var->reference(), outsize);
              ptr += outsize;
              *ptr++ = 0;       // doubles are terminated too!
              *ptr++ = 0;       // doubles are terminated too!
@@ -276,14 +276,14 @@
                  ptr += outsize+1;
              } else {          // null terminate the string
                   assert(ptr+outsize < endPtr);
-                 memcpy(ptr, var, outsize);
+                 memcpy(ptr, var->reference(), outsize);
                  ptr += outsize;
                  *ptr++ = 0;
              }
              break;
          default:
               assert(ptr+outsize < endPtr);
-             memcpy(ptr, var, outsize);
+             memcpy(ptr, var->reference(), outsize);
              ptr += outsize;
        }
        delete var;

Index: libnet/cque.cpp
===================================================================
RCS file: /sources/gnash/gnash/libnet/cque.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libnet/cque.cpp     1 Apr 2008 22:20:36 -0000       1.8
+++ libnet/cque.cpp     6 Apr 2008 18:11:34 -0000       1.9
@@ -182,10 +182,12 @@
     GNASH_REPORT_FUNCTION;
     deque<amf::Buffer *>::iterator it;
     boost::mutex::scoped_lock lock(_mutex);
-    for (it = _que.begin(); it != _que.end(); it++) {
+    for (it = _que.begin(); it != _que.end(); ) {
        amf::Buffer *ptr = *(it);
        if (ptr->reference() == element->reference()) {
-           _que.erase(it);
+           it = _que.erase(it);
+       } else {
+           it++;
        }
     }
 }
@@ -197,16 +199,17 @@
 {
     GNASH_REPORT_FUNCTION;
     int totalsize = 0;
-    deque<amf::Buffer *>::iterator it;
-    vector<deque<amf::Buffer *>::iterator> elements;
-    vector<deque<amf::Buffer *>::iterator>::iterator eit;
+    Que::iterator it;
+    vector<Que::iterator> elements; // iterators to elements to merge
+    vector<Que::iterator>::iterator eit;
+
     boost::mutex::scoped_lock lock(_mutex);
     for (it = _que.begin(); it != _que.end(); it++) {
        amf::Buffer *ptr = *(it);
        if (totalsize > 0) {
            totalsize += ptr->size();
-           elements.push_back(it);
-           if (ptr->size() < gnash::NETBUFSIZE) {
+           elements.push_back(it); // add this element to the ones to merge
+           if (ptr->size() < gnash::NETBUFSIZE) {// stop merging here
                amf::Buffer *newbuf = new amf::Buffer(totalsize);
                Network::byte_t *tmp = newbuf->reference();
                amf::Buffer *buf;

Index: libnet/cque.h
===================================================================
RCS file: /sources/gnash/gnash/libnet/cque.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libnet/cque.h       1 Apr 2008 22:20:36 -0000       1.6
+++ libnet/cque.h       6 Apr 2008 18:11:34 -0000       1.7
@@ -79,7 +79,9 @@
     // an optional name for the queue, only used for debugging messages to 
make them unique
     std::string _name;
     // The queue itself
-    std::deque<amf::Buffer *> _que;
+    typedef std::deque<amf::Buffer *> Que;
+    Que _que;
+
     // A condition variable used to signal the other thread when the que has 
data
     boost::condition   _cond;
     // This is the mutex used by the condition variable. It needs to be 
separate from the