Changeset 1161:636acc108cd9

Timestamp:

02/22/09 13:47:43 (3 years ago)

Author:

niam

Branch:

libdodo

Message:

resolved issue #44: pc::sync::protector is a public interface that wraps pc::(process|thread)::section

Location:

trunk

Files:

• Makefile.in (modified) (7 diffs)
• configure.in (modified) (39 diffs)
• include/libdodo/cgiFastExchange.h (modified) (1 diff)
• include/libdodo/cgiFastServer.h (modified) (1 diff)
• include/libdodo/ioChannel.h (modified) (3 diffs)
• include/libdodo/ioEvent.h (modified) (3 diffs)
• include/libdodo/ioNetworkExchange.h (modified) (1 diff)
• include/libdodo/ioNetworkSslExchange.h (modified) (1 diff)
• include/libdodo/ioPipe.h (modified) (1 diff)
• include/libdodo/ioStdio.h (modified) (1 diff)
• include/libdodo/pcSyncDataCollection.h (modified) (1 diff)
• include/libdodo/pcSyncProcessDataCollection.h (modified) (3 diffs)
• include/libdodo/pcSyncProcessStack.h (deleted)
• include/libdodo/pcSyncProtector.h (moved) (moved from trunk/include/libdodo/pcSyncStack.h) (3 diffs)
• include/libdodo/pcSyncThreadDataCollection.h (modified) (3 diffs)
• include/libdodo/pcSyncThreadStack.h (deleted)
• include/libdodo/toolsCode.h (modified) (1 diff)
• include/libdodo/toolsLogger.h (modified) (3 diffs)
• src/ioChannel.cc (modified) (6 diffs)
• src/ioEvent.cc (modified) (8 diffs)
• src/ioFileFifo.cc (modified) (8 diffs)
• src/ioFileRegular.cc (modified) (7 diffs)
• src/ioFileTemp.cc (modified) (7 diffs)
• src/ioNetworkExchange.cc (modified) (5 diffs)
• src/ioNetworkSslExchange.cc (modified) (3 diffs)
• src/ioPipe.cc (modified) (9 diffs)
• src/ioString.cc (modified) (2 diffs)
• src/pcSyncProcessDataCollection.cc (modified) (6 diffs)
• src/pcSyncProcessStack.cc (deleted)
• src/pcSyncProtector.cc (moved) (moved from trunk/src/pcSyncStack.cc) (2 diffs)
• src/pcSyncThreadDataCollection.cc (modified) (6 diffs)
• src/pcSyncThreadStack.cc (deleted)
• src/toolsLogger.cc (modified) (5 diffs)
• tests/pcprocesscollection_test/test.cc (modified) (6 diffs)

trunk/Makefile.in

@@ -1 @@
-
 prefix:=@prefix@
 datarootdir:=@datarootdir@
@@ -13 +12 @@
 
 CPPFLAGS:=-I./include @CPPFLAGS@
-LDFLAGS:=-L./ @LDFLAGS@ 
+LDFLAGS:=-L./ @LDFLAGS@
 CFLAGS:=@CFLAGS@ @DEFS@
 
@@ -86 +85 @@
         graphicsDraw.o \
         graphicsColor.o \
-        pcSyncStack.o \
+        pcSyncProtector.o \
         pcSyncSection.o \
         pcSyncThreadSection.o \
@@ -93 +92 @@
         pcThreadCollection.o \
         pcJobCollection.o \
-        pcSyncThreadStack.o \
-        pcSyncProcessStack.o \
         pcSyncThreadDataSingle.o \
         pcSyncProcessDataSingle.o \
@@ -121 +118 @@
         @rm -f $@.so
         @$(LN_S) @PACKAGE_NAME@.so.@SO_VERSION@ $@.so
-        
+
         @echo ""
         @echo ""
@@ -153 +150 @@
         @echo "-- Installing: ${DESTDIR}$(bindir)/dodo-config"
         @echo ${DESTDIR}$(bindir)/dodo-config >> install_manifest.txt
-        
+
         @echo ""
         @echo ""
@@ -162 +159 @@
 clean:
         @rm -rf *.o *.so* *.a*
-

trunk/configure.in

@@ -1 @@
-
 AC_PREREQ(2.60)
 
@@ -82 +81 @@
 AC_SUBST(DEBUG)
 AC_ARG_ENABLE(debug,
-        AS_HELP_STRING([--enable-debug], [enable debug info]), 
+        AS_HELP_STRING([--enable-debug], [enable debug info]),
                 [DEBUG="$enableval"], [DEBUG="no"])
 if test "$DEBUG" = "yes"
 then
         CFLAGS="$CFLAGS -g -DDEBUG"
-        
+
         RESULT="$RESULT\nDebug\t\t\t\t\t\t\t\tenabled"
 else
@@ -94 +93 @@
 
 AC_ARG_ENABLE(profiling,
-        AS_HELP_STRING([--enable-profiling], [enable profiling]), 
+        AS_HELP_STRING([--enable-profiling], [enable profiling]),
                 [PROFILING="$enableval"], [PROFILING="no"])
 if test "$PROFILING" = "yes"
 then
         CFLAGS="$CFLAGS -pg"
-        
+
         RESULT="$RESULT\nProfiling\t\t\t\t\t\t\tenabled"
 else
@@ -106 +105 @@
 
 AC_ARG_ENABLE(libwrap,
-        AS_HELP_STRING([--disable-libwrap], [disable libwrap support]), 
+        AS_HELP_STRING([--disable-libwrap], [disable libwrap support]),
                 [LIBWRAP="$enableval"], [LIBWRAP="yes"])
 if test "$LIBWRAP" = "yes"
@@ -114 +113 @@
         then
                 LDFLAGS="$LDFLAGS -lwrap"
-                
+
                 RESULT="$RESULT\nlibwrap\t\t\t\t\t\t\t\tenabled"
         else
@@ -124 +123 @@
 
 AC_ARG_ENABLE(deque,
-        AS_HELP_STRING([--disable-deque], [use std::vector instead of std::deque]), 
+        AS_HELP_STRING([--disable-deque], [use std::vector instead of std::deque]),
                 [DEQUE="$enableval"], [DEQUE="yes"])
 if test "$DEQUE" = "yes"
 then
-        echo -n -e "#define USE_DEQUE 1\n\n" >> include/libdodo/directives.runtime.h        
-        
+        echo -n -e "#define USE_DEQUE 1\n\n" >> include/libdodo/directives.runtime.h
+
         RESULT="$RESULT\nDeque\t\t\t\t\t\t\t\tenabled"
 else
@@ -136 +135 @@
 
 AC_ARG_ENABLE(io-xexec,
-        AS_HELP_STRING([--disable-io-xexec], [compile io:: w/o xexec support]), 
+        AS_HELP_STRING([--disable-io-xexec], [compile io:: w/o xexec support]),
                 [IO_W_XEXEC="$enableval"], [IO_W_XEXEC="yes"])
 if test "$IO_W_XEXEC" = "no"
 then
-        echo -n -e "#define IO_WO_XEXEC 1\n\n" >> include/libdodo/directives.runtime.h        
+        echo -n -e "#define IO_WO_XEXEC 1\n\n" >> include/libdodo/directives.runtime.h
         RESULT="$RESULT\nio::stdio xexec support\t\t\t\t\t\tdisabled"
         RESULT="$RESULT\nio::network::exchange xexec support\t\t\t\tdisabled"
@@ -165 +164 @@
 if test "$DATABASE_W_XEXEC" = "no"
 then
-        echo -n -e "#define DATABASE_WO_XEXEC 1\n\n" >> include/libdodo/directives.runtime.h        
+        echo -n -e "#define DATABASE_WO_XEXEC 1\n\n" >> include/libdodo/directives.runtime.h
 fi
 
@@ -188 +187 @@
 
 AC_ARG_WITH([sqlite3],
-        AS_HELP_STRING([--with-sqlite3@<:@=DIR@:>@], [use sqlite3]), 
+        AS_HELP_STRING([--with-sqlite3@<:@=DIR@:>@], [use sqlite3]),
                 [MOD_SQLITE3_DIR="$withval"], [MOD_SQLITE3="no"])
 if test "$MOD_SQLITE3" != "no" -a "$MOD_SQLITE3_DIR" != "no"
@@ -202 +201 @@
         AC_CHECK_HEADER([sqlite3.h], [], AC_MSG_ERROR(sqlite3 header was not found))
         echo -n -e "#define SQLITE3_EXT 1\n\n" >> include/libdodo/directives.runtime.h
-        
+
         RESULT="$RESULT\nSQLite\t\t\t\t\t\t\t\tenabled"
 
@@ -216 +215 @@
 
 AC_ARG_WITH([openssl],
-        AS_HELP_STRING([--with-openssl@<:@=DIR@:>@], [use openssl]), 
+        AS_HELP_STRING([--with-openssl@<:@=DIR@:>@], [use openssl]),
                 [MOD_OPENSSL_DIR="$withval"], [MOD_OPENSSL="no"])
 if test "$MOD_OPENSSL" != "no" -a "$MOD_OPENSSL_DIR" != "no"
@@ -257 +256 @@
 
 AC_ARG_WITH([bfd],
-        AS_HELP_STRING([--with-bfd@<:@=DIR@:>@], [support library name resolution]), 
+        AS_HELP_STRING([--with-bfd@<:@=DIR@:>@], [support library name resolution]),
                 [MOD_BFD_DIR="$withval"], [MOD_BFD="no"])
 if test "$MOD_BFD" != "no" -a "$MOD_BFD_DIR" != "no"
@@ -277 +276 @@
 
 AC_ARG_WITH([postgresql],
-        AS_HELP_STRING([--with-postgresql@<:@=DIR@:>@], [use postgresql]), 
+        AS_HELP_STRING([--with-postgresql@<:@=DIR@:>@], [use postgresql]),
                 [MOD_POSTGRESQL_DIR="$withval"], [MOD_POSTGRESQL="no"])
 if test "$MOD_POSTGRESQL" != "no" -a "$MOD_POSTGRESQL_DIR" != "no"
@@ -298 +297 @@
         AC_CHECK_LIB([pq], [PQexecParams], [], AC_MSG_ERROR(postgresql lib was not found))
         AC_CHECK_HEADER([libpq-fe.h], [], AC_MSG_ERROR(postgresql header was not found))
-        
+
         AC_LANG_PUSH(C++)
-        AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include <libpq-fe.h>]], [[pg_encoding_to_char(0);]]), [], 
+        AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include <libpq-fe.h>]], [[pg_encoding_to_char(0);]]), [],
                 [echo -n -e "#define POSTGRESQL_NO_ENCODINGTOCHAR 1\n\n" >> include/libdodo/directives.runtime.h])
         AC_LANG_POP()
@@ -319 +318 @@
 
 AC_ARG_WITH([mysql],
-        AS_HELP_STRING([--with-mysql@<:@=DIR@:>@], [use mysql]), 
+        AS_HELP_STRING([--with-mysql@<:@=DIR@:>@], [use mysql]),
                 [MOD_MYSQL_DIR="$withval"], [MOD_MYSQL="no"])
 if test "$MOD_MYSQL" != "no" -a "$MOD_MYSQL_DIR" != "no"
@@ -341 +340 @@
         AC_CHECK_LIB([mysqlclient], [mysql_init], [], AC_MSG_ERROR(mySQL lib was not found))
         AC_CHECK_HEADER([mysql.h], [], AC_MSG_ERROR(mySQL header was not found))
-        
+
         AC_LANG_PUSH(C++)
-        AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include <mysql.h>]], [[my_bool rc = 1; mysql_options(0, MYSQL_OPT_RECONNECT, &rc);]]), [], 
+        AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include <mysql.h>]], [[my_bool rc = 1; mysql_options(0, MYSQL_OPT_RECONNECT, &rc);]]), [],
                 [echo -n -e "#define MYSQL_NO_OPT_RECONNECT 1\n\n" >> include/libdodo/directives.runtime.h])
         AC_LANG_POP()
-        
+
         echo -n -e "#define MYSQL_EXT 1\n\n" >> include/libdodo/directives.runtime.h
 
@@ -355 +354 @@
                 RESULT="$RESULT\ndata::base::mysql xexec support\t\t\t\t\tenabled"
         fi
-        
+
         RESULT="$RESULT\nMySQL\t\t\t\t\t\t\t\tenabled"
 else
@@ -362 +361 @@
 
 AC_ARG_WITH([fast-cgi],
-        AS_HELP_STRING([--with-fast-cgi@<:@=DIR@:>@], [use fast CGI]), 
+        AS_HELP_STRING([--with-fast-cgi@<:@=DIR@:>@], [use fast CGI]),
                 [MOD_FASTCGI_DIR="$withval"], [MOD_FASTCGI="no"])
 if test "$MOD_FASTCGI" != "no" -a "$MOD_FASTCGI_DIR" != "no"
@@ -382 +381 @@
                 RESULT="$RESULT\ncgi::fast::exchange xexec support\t\t\t\tenabled"
         fi
-        
+
         RESULT="$RESULT\nFastCGI\t\t\t\t\t\t\t\tenabled"
 else
@@ -389 +388 @@
 
 AC_ARG_WITH([pcre],
-        AS_HELP_STRING([--with-pcre@<:@=DIR@:>@], [use pcre]), 
+        AS_HELP_STRING([--with-pcre@<:@=DIR@:>@], [use pcre]),
                 [MOD_PCRE_DIR="$withval"], [MOD_PCRE="no"])
 if test "$MOD_PCRE" != "no" -a "$MOD_PCRE_DIR" != "no"
@@ -406 +405 @@
         AC_CHECK_HEADER([pcre.h], [], AC_MSG_ERROR(pcre header was not found))
         echo -n -e "#define PCRE_EXT 1\n\n" >> include/libdodo/directives.runtime.h
-        
+
         RESULT="$RESULT\nPCRE\t\t\t\t\t\t\t\tenabled"
 else
@@ -414 +413 @@
 
 AC_ARG_ENABLE(dl,
-        AS_HELP_STRING([--enable-dl], [enable dynamic loading]), 
+        AS_HELP_STRING([--enable-dl], [enable dynamic loading]),
                 [DL="$enableval"], [DL="no"])
 if test "$DL" = "yes"
 then
         echo -n -e "#define DL_EXT 1\n\n" >> include/libdodo/directives.runtime.h
-        
+
         AC_ARG_ENABLE(fast-dynamic-loading,
-                AS_HELP_STRING([--disable-fast-dynamic-loading], [do not unload library to produce better performance]), 
+                AS_HELP_STRING([--disable-fast-dynamic-loading], [do not unload library to produce better performance]),
                         [DL_FAST="$enableval"], [DL_FAST="yes"])
 
         if test "$DL_FAST" = "yes" -a "$OS" = "Linux"
         then
-                echo -n -e "#define DL_FAST 1\n\n" >> include/libdodo/directives.runtime.h        
+                echo -n -e "#define DL_FAST 1\n\n" >> include/libdodo/directives.runtime.h
 
                 RESULT="$RESULT\nFast dynamic loading\t\t\t\t\t\tenabled"
@@ -439 +438 @@
 
 AC_ARG_WITH([libxml2],
-        AS_HELP_STRING([--with-libxml2@<:@=DIR@:>@], [use libxml2]), 
+        AS_HELP_STRING([--with-libxml2@<:@=DIR@:>@], [use libxml2]),
                 [MOD_LIBXML2_DIR="$withval"], [MOD_LIBXML2="no"])
 if test "$MOD_LIBXML2" != "no" -a "$MOD_LIBXML2_DIR" != "no"
@@ -462 +461 @@
         AC_CHECK_HEADER([libxml/xmlmemory.h], [], AC_MSG_ERROR(libxml2 header was not found))
         echo -n -e "#define LIBXML2_EXT 1\n\n" >> include/libdodo/directives.runtime.h
-        
+
         RESULT="$RESULT\nlibxml2\t\t\t\t\t\t\t\tenabled"
 else
@@ -469 +468 @@
 
 AC_ARG_WITH([threading-lib],
-        AS_HELP_STRING([--with-threading-lib@<:@=lib@:>@], [specify threading library(supported: pthread), pthread by default]), 
+        AS_HELP_STRING([--with-threading-lib@<:@=lib@:>@], [specify threading library(supported: pthread), pthread by default]),
                 [MOD_THREAD="$withval"], [MOD_THREAD="pthread"])
 case "$MOD_THREAD" in
         pthread)
                 AC_ARG_WITH([pthread-lib],
-                        AS_HELP_STRING([--with-pthread-lib@<:@=lib@:>@], [use pthread library(supported: pthread, thr, lthread, c_r), pthread by default]), 
+                        AS_HELP_STRING([--with-pthread-lib@<:@=lib@:>@], [use pthread library(supported: pthread, thr, lthread, c_r), pthread by default]),
                                 [MOD_PTHREAD_LIB="$withval"], [MOD_PTHREAD_LIB="pthread"])
                 AC_ARG_WITH([pthread-path],
-                        AS_HELP_STRING([--with-pthread-path@<:@=DIR@:>@], [path to pthread installation]), 
+                        AS_HELP_STRING([--with-pthread-path@<:@=DIR@:>@], [path to pthread installation]),
                                 [MOD_PTHREAD_DIR="$withval"], [MOD_PTHREAD_DIR="/usr"])
                 CPPFLAGS="$CPPFLAGS -I$MOD_PTHREAD_DIR/include"
@@ -492 +491 @@
 
 AC_ARG_WITH([bzip2],
-        AS_HELP_STRING([--with-bzip2@<:@=DIR@:>@], [use bzip2]), 
+        AS_HELP_STRING([--with-bzip2@<:@=DIR@:>@], [use bzip2]),
                 [MOD_BZIP2_DIR="$withval"], [MOD_BZIP2="no"])
 if test "$MOD_BZIP2" != "no" -a "$MOD_BZIP2_DIR" != "no"
@@ -505 +504 @@
         AC_CHECK_HEADER([bzlib.h], [], AC_MSG_ERROR(bz2 header was not found))
         echo -n -e "#define BZIP2_EXT 1\n\n" >> include/libdodo/directives.runtime.h
-        
+
         RESULT="$RESULT\nBZIP2\t\t\t\t\t\t\t\tenabled"
 else
@@ -512 +511 @@
 
 AC_ARG_WITH([zlib],
-        AS_HELP_STRING([--with-zlib@<:@=DIR@:>@], [use zlib]), 
+        AS_HELP_STRING([--with-zlib@<:@=DIR@:>@], [use zlib]),
                 [MOD_ZLIB_DIR="$withval"], [MOD_ZLIB="no"])
 if test "$MOD_ZLIB" != "no" -a "$MOD_ZLIB_DIR" != "no"
@@ -524 +523 @@
         AC_CHECK_HEADER([zlib.h])
         AC_ARG_ENABLE([zlib-lib],
-                AS_HELP_STRING([--enable-zlib-lib], [enable zlib as lib]), 
+                AS_HELP_STRING([--enable-zlib-lib], [enable zlib as lib]),
                         [MOD_ZLIB_LIB="yes"], [MOD_ZLIB_LIB="no"])
         if test "$MOD_ZLIB_LIB" = "yes"
@@ -532 +531 @@
         fi
         echo -n -e "#define ZLIB_EXT 1\n\n" >> include/libdodo/directives.runtime.h
-        
+
         RESULT="$RESULT\nZLIB\t\t\t\t\t\t\t\tenabled"
 else
@@ -539 +538 @@
 
 AC_ARG_WITH([iconv],
-        AS_HELP_STRING([--with-iconv@<:@=DIR@:>@], [use iconv]), 
+        AS_HELP_STRING([--with-iconv@<:@=DIR@:>@], [use iconv]),
                 [MOD_ICONV_DIR="$withval"], [MOD_ICONV="no"])
 if test "$MOD_ICONV" != "no" -a "$MOD_ICONV_DIR" != "no"
@@ -551 +550 @@
         AC_CHECK_HEADER([iconv.h])
         AC_ARG_ENABLE([iconv-lib],
-                AS_HELP_STRING([--enable-iconv-lib], [enable iconv as lib]), 
+                AS_HELP_STRING([--enable-iconv-lib], [enable iconv as lib]),
                         [MOD_ICONV_LIB="yes"], [MOD_ICONV_LIB="no"])
                 if test "$MOD_ICONV_LIB" = "yes"
@@ -559 +558 @@
         fi
         echo -n -e "#define ICONV_EXT 1\n\n" >> include/libdodo/directives.runtime.h
-        
+
         RESULT="$RESULT\niconv\t\t\t\t\t\t\t\tenabled"
 else
@@ -566 +565 @@
 
 AC_ARG_WITH([imagemagick],
-        AS_HELP_STRING([--with-imagemagick@<:@=DIR@:>@], [use ImageMagick]), 
+        AS_HELP_STRING([--with-imagemagick@<:@=DIR@:>@], [use ImageMagick]),
                 [MOD_IMAGEMAGICK_DIR="$withval"], [MOD_IMAGEMAGICK="no"])
 if test "$MOD_IMAGEMAGICK" != "no" -a "$MOD_IMAGEMAGICK_DIR" != "no"
@@ -601 +600 @@
         else
                 LDFLAGS="$LDFLAGS -lMagickCore"
-                
+
         fi
         if test "$VERY_OLD_IMAGEMAGICK_LIB" != "yes"
@@ -612 +611 @@
 
         AC_ARG_ENABLE(graphics-xexec,
-                AS_HELP_STRING([--disable-graphics-xexec], [compile graphics w/o xexec support]), 
+                AS_HELP_STRING([--disable-graphics-xexec], [compile graphics w/o xexec support]),
                         [GRAPHICS_W_XEXEC="$enableval"], [GRAPHICS_W_XEXEC="yes"])
         if test "$GRAPHICS_W_XEXEC" = "no"
         then
-                echo -n -e "#define GRAPHICS_WO_XEXEC 1\n\n" >> include/libdodo/directives.runtime.h        
-                
+                echo -n -e "#define GRAPHICS_WO_XEXEC 1\n\n" >> include/libdodo/directives.runtime.h
+
                 RESULT="$RESULT\ngraphics xexec support\t\t\t\t\t\tdisabled"
         else
                 RESULT="$RESULT\ngraphics xexec support\t\t\t\t\t\tenabled"
         fi
-        
+
         RESULT="$RESULT\nImageMagick\t\t\t\t\t\t\tenabled"
 else
@@ -736 +735 @@
         AC_LANG_POP()
 
-        echo -n -e "#define CALLSTACK_EX 1\n\n" >> include/libdodo/directives.runtime.h        
+        echo -n -e "#define CALLSTACK_EX 1\n\n" >> include/libdodo/directives.runtime.h
 fi
 
@@ -743 +742 @@
         AC_CHECK_HEADER([dlfcn.h], [], [AC_MSG_ERROR(dlfcn.h header was not found)])
         AC_ARG_ENABLE([dl-lib],
-                AS_HELP_STRING([--disable-dl-lib], [disable dl as lib]), 
+                AS_HELP_STRING([--disable-dl-lib], [disable dl as lib]),
                         [MOD_DL_LIB="$enableval"], [MOD_DL_LIB="yes"])
         if test "$MOD_DL_LIB" = "yes"
@@ -752 +751 @@
 fi
 
-echo -n -e "#endif\n" >> include/libdodo/directives.runtime.h        
+echo -n -e "#endif\n" >> include/libdodo/directives.runtime.h
 
 ##

trunk/include/libdodo/cgiFastExchange.h

@@ -41 +41 @@
 #include <libdodo/cgiExchange.h>
 #include <libdodo/ioChannel.h>
-#include <libdodo/pcSyncThreadStack.h>
 
 namespace dodo

trunk/include/libdodo/cgiFastServer.h

@@ -48 +48 @@
 #include <libdodo/cgiFastExchange.h>
 #include <libdodo/ioChannel.h>
-#include <libdodo/pcSyncThreadStack.h>
 
 namespace dodo

trunk/include/libdodo/ioChannel.h

@@ -36 +36 @@
 #include <libdodo/types.h>
 #include <libdodo/ioEventInfo.h>
-#include <libdodo/pcSyncThreadStack.h>
+#include <libdodo/pcSyncProcessSection.h>
+#include <libdodo/pcSyncProtector.h>
 
 namespace dodo
@@ -83 +84 @@
                  * @brief implements an interface for I/O operations
                  */
-                class channel : virtual public eventInfo,
-                                                virtual public pc::sync::thread::stack
+                class channel : virtual public eventInfo
 #ifndef IO_WO_XEXEC
                                                 ,
@@ -169 +169 @@
 
 #endif
+                        pc::sync::section *keeper;                                                       ///< section locker
                 };
         };

trunk/include/libdodo/ioEvent.h

@@ -40 +40 @@
 #include <libdodo/toolsMisc.h>
 #include <libdodo/ioEventInfo.h>
-#include <libdodo/pcSyncThreadStack.h>
+#include <libdodo/pcSyncProcessSection.h>
+#include <libdodo/pcSyncProtector.h>
 
 namespace dodo
@@ -62 +63 @@
                  * @brief provides information if in/output stream is readable/writable
                  */
-                class event : virtual public pc::sync::thread::stack
+                class event
                 {
                   private:
@@ -137 +138 @@
 
                         int descs;                                  ///< descriptors counter
+
+                        pc::sync::section *keeper;                                      ///< section locker
                 };
         };

trunk/include/libdodo/ioNetworkExchange.h

@@ -49 +49 @@
 #include <libdodo/types.h>
 #include <libdodo/xexec.h>
-#include <libdodo/pcSyncThreadStack.h>
 
 namespace dodo

trunk/include/libdodo/ioNetworkSslExchange.h

@@ -53 +53 @@
 #include <libdodo/types.h>
 #include <libdodo/xexec.h>
-#include <libdodo/pcSyncThreadStack.h>
 
 namespace dodo

trunk/include/libdodo/ioPipe.h

@@ -45 +45 @@
 #include <libdodo/ioChannel.h>
 #include <libdodo/ioNetwork.h>
-#include <libdodo/pcSyncThreadStack.h>
 
 namespace dodo

trunk/include/libdodo/ioStdio.h

@@ -42 +42 @@
 #include <libdodo/types.h>
 #include <libdodo/ioPipe.h>
-#include <libdodo/pcSyncThreadStack.h>
 
 namespace dodo

trunk/include/libdodo/pcSyncDataCollection.h

@@ -34 +34 @@
 
 #include <libdodo/types.h>
-#include <libdodo/pcSyncStack.h>
 
 namespace dodo

trunk/include/libdodo/pcSyncProcessDataCollection.h

@@ -36 +36 @@
 #include <libdodo/pcSyncDataCollection.h>
 #include <libdodo/pcSyncProcessDataCollectionEx.h>
-#include <libdodo/pcSyncProcessStack.h>
+#include <libdodo/pcSyncProcessSection.h>
+#include <libdodo/pcSyncProtector.h>
 
 namespace dodo
@@ -52 +53 @@
                                          * @brief implements collection of shared data for processes
                                          */
-                                        class collection : public sync::data::collection,
-                                                                           virtual public sync::process::stack
+                                        class collection : public sync::data::collection
                                         {
                                           private:
@@ -123 +123 @@
 
                                                 dodoList<pc::sync::data::__info>::iterator current; ///< iterator for list of shared data[for matched with getShare method]
+
+                                                section *keeper;                                                                        ///< section locker
                                         };
                                 };

trunk/include/libdodo/pcSyncProtector.h

@@ -1 +1 @@
 /***************************************************************************
- *            pcSyncStack.h
+ *            pcSyncProtector.h
  *
  *  Sat Oct 20 02:00:55 2007
@@ -28 +28 @@
  */
 
-#ifndef _PCSYNCSTACK_H_
-#define _PCSYNCSTACK_H_ 1
+#ifndef _PCSYNCPROTECTOR_H_
+#define _PCSYNCPROTECTOR_H_ 1
 
 #include <libdodo/directives.h>
@@ -44 +44 @@
                 {
                         /**
-                         * @class stack
-                         * @brief provides mutex lock and guard class
+                         * @class protector
+                         * @brief provides thread/process safe behaviour
+                         * @note it locks in constructor and unlocks in destructor
                          */
-                        class stack
+                        class protector
                         {
-                          protected:
+                          public:
 
-                                section *keeper; ///< lock
+                                /**
+                                 * contructor
+                                 */
+                                protector(section *parent);
 
                                 /**
                                  * destructor
                                  */
-                                virtual ~stack() = 0;
+                                virtual ~protector();
 
-                                /**
-                                 * @class protector
-                                 * @brief provides thread safe behaviour
-                                 * @note it locks in constructor and unlocks in destructor
-                                 */
-                                class protector
-                                {
-                                  public:
+                          protected:
 
-                                        /**
-                                         * contructor
-                                         */
-                                        protector(const stack *parent);
-
-                                        /**
-                                         * destructor
-                                         */
-                                        virtual ~protector();
-
-                                  protected:
-
-                                        const stack *parent; ///< lock
-                                };
+                                section *keeper; ///< lock
                         };
                 };

trunk/include/libdodo/pcSyncThreadDataCollection.h

@@ -36 +36 @@
 #include <libdodo/pcSyncDataCollection.h>
 #include <libdodo/pcSyncThreadDataCollectionEx.h>
-#include <libdodo/pcSyncThreadStack.h>
+#include <libdodo/pcSyncProtector.h>
+#include <libdodo/pcSyncThreadSection.h>
 
 namespace dodo
@@ -52 +53 @@
                                          * @brief implements collection of shared data for threads
                                          */
-                                        class collection : public sync::data::collection,
-                                                                           virtual public sync::thread::stack
+                                        class collection : public sync::data::collection
                                         {
                                           private:
@@ -123 +123 @@
 
                                                 dodoList<pc::sync::data::__info>::iterator current; ///< iterator for list of shared data[for matched with getShare method]
+
+                                                section *keeper;                                                                        ///< section locker
                                         };
                                 };

trunk/include/libdodo/toolsCode.h

@@ -58 +58 @@
 
 #include <libdodo/types.h>
-#include <libdodo/ioNetwork.h>
-#include <libdodo/toolsNetwork.h>
 #include <libdodo/toolsString.h>
 #include <libdodo/toolsCodeEx.h>

trunk/include/libdodo/toolsLogger.h

@@ -35 +35 @@
 #include <libdodo/ioChannel.h>
 #include <libdodo/toolsTime.h>
-#include <libdodo/pcSyncThreadStack.h>
+#include <libdodo/pcSyncProcessSection.h>
+#include <libdodo/pcSyncProtector.h>
 #include <libdodo/types.h>
 
@@ -77 +78 @@
                  * @brief provides logging function
                  */
-                class logger : virtual public pc::sync::thread::stack,
-                                           public singleton<logger>
+                class logger : public singleton<logger>
                 {
                   public:
@@ -135 +135 @@
                         static const dodoString levels[LOGGER_LEVELS];  ///< log levels statements
                         static const int syslogLevels[LOGGER_LEVELS];   ///< syslog log levels
+
+                        pc::sync::section *keeper;                                              ///< section locker
                 };
         };

trunk/src/ioChannel.cc

@@ -44 +44 @@
 
 channel::channel() : inSize(IO_INSIZE),
-                                         outSize(IO_OUTSIZE)
+                                         outSize(IO_OUTSIZE),
+                                         keeper(new pc::sync::process::section)
 
 #ifndef IO_WO_XEXEC
@@ -59 +60 @@
 channel::~channel()
 {
+        delete keeper;
 }
 
@@ -65 +67 @@
 dodoString channel::read()
 {
-        protector pg(this);
+        pc::sync::protector pg(keeper);
 
         dodoString a_str;
@@ -125 +127 @@
 dodoString channel::readStream()
 {
-        protector pg(this);
+        pc::sync::protector pg(keeper);
 
         dodoString a_str;
@@ -191 +193 @@
 void channel::write(const dodoString &a_data)
 {
-        protector pg(this);
+        pc::sync::protector pg(keeper);
 
 #ifndef IO_WO_XEXEC
@@ -228 +230 @@
 void channel::writeStream(const dodoString &a_data)
 {
-        protector pg(this);
+        pc::sync::protector pg(keeper);
 
 #ifndef IO_WO_XEXEC

trunk/src/ioEvent.cc

@@ -40 +40 @@
 //-------------------------------------------------------------------
 
-event::event() : descs(0)
+event::event() : descs(0),
+                                 keeper(new pc::sync::process::section)
 {
 }
@@ -48 +49 @@
 event::~event()
 {
+        delete keeper;
 }
 
@@ -54 +56 @@
 int event::addChannel(const eventInfo &fl)
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         __eventInOutDescriptors tempD;
@@ -72 +74 @@
                                                                  int                  timeout) const
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         int count = -1;
@@ -157 +159 @@
                                                                  int                  timeout) const
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         int count = -1;
@@ -242 +244 @@
                                            int timeout) const
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         pollfd fd;
@@ -288 +290 @@
 void event::delChannel(int pos)
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         dodoArray<__eventInOutDescriptors>::iterator i(desc.begin()), j(desc.end());
@@ -307 +309 @@
                                            int timeout) const
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         pollfd fd;

trunk/src/ioFileFifo.cc

@@ -204 +204 @@
 int fifo::getInDescriptor() const
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (handler == NULL)
@@ -218 +218 @@
 int fifo::getOutDescriptor() const
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (handler == NULL)
@@ -232 +232 @@
 void fifo::clone(const fifo &fd)
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (handler != NULL)
@@ -293 +293 @@
 void fifo::close()
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
 #ifndef IO_WO_XEXEC
@@ -320 +320 @@
                                 short            a_mode)
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
 #ifndef IO_WO_XEXEC
@@ -426 +426 @@
 bool fifo::isBlocked()
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         return blocked;
@@ -435 +435 @@
 void fifo::block(bool flag)
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (handler == NULL)
@@ -650 +650 @@
 void fifo::flush()
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (handler == NULL)

trunk/src/ioFileRegular.cc

@@ -209 +209 @@
 int regular::getInDescriptor() const
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (handler == NULL)
@@ -223 +223 @@
 int regular::getOutDescriptor() const
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (handler == NULL)
@@ -237 +237 @@
 void regular::clone(const regular &fd)
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (handler != NULL)
@@ -306 +306 @@
 void regular::close()
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
 #ifndef IO_WO_XEXEC
@@ -333 +333 @@
                                    short            a_mode)
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
 #ifndef IO_WO_XEXEC
@@ -543 +543 @@
 void regular::erase()
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         char *empty = new char[outSize];
@@ -574 +574 @@
 void regular::flush()
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (handler == NULL)

trunk/src/ioFileTemp.cc

@@ -111 +111 @@
 int temp::getInDescriptor() const
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (handler == NULL)
@@ -125 +125 @@
 int temp::getOutDescriptor() const
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (handler == NULL)
@@ -139 +139 @@
 void temp::clone(const temp &fd)
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (handler != NULL)
@@ -187 +187 @@
 void temp::close()
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
 #ifndef IO_WO_XEXEC
@@ -213 +213 @@
 void temp::open()
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
 #ifndef IO_WO_XEXEC
@@ -355 +355 @@
 void temp::erase()
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         char *empty = new char[outSize];
@@ -386 +386 @@
 void temp::flush()
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (handler == NULL)

trunk/src/ioNetworkExchange.cc

@@ -117 +117 @@
 void exchange::close()
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
 #ifndef IO_WO_XEXEC
@@ -142 +142 @@
                                         bool blockInherited)
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (socket != -1)
@@ -183 +183 @@
 bool exchange::isAlive()
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (socket == -1)
@@ -449 +449 @@
 int exchange::getInDescriptor() const
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         return socket;
@@ -458 +458 @@
 int exchange::getOutDescriptor() const
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         return socket;

trunk/src/ioNetworkSslExchange.cc

@@ -140 +140 @@
 void exchange::close()
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
 #ifndef IO_WO_XEXEC
@@ -167 +167 @@
                                         bool blockInherited)
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (socket != -1)
@@ -210 +210 @@
 bool exchange::isAlive()
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (socket == -1)

trunk/src/ioPipe.cc

@@ -145 +145 @@
 void io::pipe::clone(const pipe &fd)
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (inHandle != NULL)
@@ -219 +219 @@
 int io::pipe::getInDescriptor() const
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (inHandle == NULL)
@@ -233 +233 @@
 int io::pipe::getOutDescriptor() const
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (outHandle == NULL)
@@ -247 +247 @@
 void io::pipe::close()
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
 #ifndef IO_WO_XEXEC
@@ -283 +283 @@
 void io::pipe::open()
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
 #ifndef IO_WO_XEXEC
@@ -506 +506 @@
 void io::pipe::flush()
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (outHandle == NULL)
@@ -523 +523 @@
 io::network::__peerInfo io::pipe::peerInfo()
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (inHandle == NULL)
@@ -596 +596 @@
 bool io::pipe::isBlocked()
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         return blocked;
@@ -605 +605 @@
 void io::pipe::block(bool flag)
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         if (inHandle == NULL && outHandle == NULL)

trunk/src/ioString.cc

@@ -122 +122 @@
 void string::clone(const string &fd)
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         pos = fd.pos;
@@ -175 +175 @@
 void string::erase()
 {
-        protector pg(this);
+pc::sync::protector pg(keeper);
 
         unsigned long pos = blockOffset ? this->pos * outSize : this->pos;

trunk/src/pcSyncProcessDataCollection.cc

@@ -39 +39 @@
 //-------------------------------------------------------------------
 
-collection::collection() : shareNum(0)
+collection::collection() : shareNum(0),
+                                                   keeper(new section(0))
 {
 }
@@ -47 +48 @@
 collection::~collection()
 {
+        delete keeper;
 }
 
@@ -53 +55 @@
 unsigned long collection::add(void *data)
 {
-        protector tg(this);
+pc::sync::protector pg(keeper);
 
         pc::sync::data::__info share;
@@ -69 +71 @@
 void collection::del(unsigned long position)
 {
-        protector tg(this);
+pc::sync::protector pg(keeper);
 
         if (getShare(position))
@@ -86 +88 @@
                                          void          *data)
 {
-        protector tg(this);
+pc::sync::protector pg(keeper);
 
         if (getShare(position))
@@ -102 +104 @@
 const void *collection::get(unsigned long position)
 {
-        protector tg(this);
+pc::sync::protector pg(keeper);
 
         if (getShare(position))

trunk/src/pcSyncProtector.cc

@@ -1 +1 @@
 /***************************************************************************
- *            pcSyncStack.cc
+ *            pcSyncProtector.cc
  *
  *  Sat Oct 20 11:00:55 2007
@@ -28 +28 @@
  */
 
-#include <libdodo/pcSyncStack.h>
+#include <libdodo/pcSyncProtector.h>
 
 using namespace dodo::pc::sync;
 
-stack::~stack()
+protector::protector(section *a_keeper) : keeper(a_keeper)
 {
+        keeper->acquire();
 }
 
 //-------------------------------------------------------------------
 
-stack::protector::protector(const stack *a_parent) : parent(a_parent)
-{
-        parent->keeper->acquire();
-}
-
-//-------------------------------------------------------------------
-
-stack::protector::~protector()
+protector::~protector()
 {
         try
         {
-                parent->keeper->release();
+                keeper->release();
         }
         catch (exception::basic &ex)

trunk/src/pcSyncThreadDataCollection.cc

@@ -39 +39 @@
 //-------------------------------------------------------------------
 
-collection::collection() : shareNum(0)
+collection::collection() : shareNum(0),
+                                                   keeper(new section)
 {
 }
@@ -47 +48 @@
 collection::~collection()
 {
+        delete keeper;
 }
 
@@ -53 +55 @@
 unsigned long collection::add(void *data)
 {
-        protector tg(this);
+pc::sync::protector tg(keeper);
 
         pc::sync::data::__info share;
@@ -69 +71 @@
 void collection::del(unsigned long position)
 {
-        protector tg(this);
+pc::sync::protector tg(keeper);
 
         if (getShare(position))
@@ -86 +88 @@
                                          void          *data)
 {
-        protector tg(this);
+pc::sync::protector tg(keeper);
 
         if (getShare(position))
@@ -102 +104 @@
 const void *collection::get(unsigned long position)
 {
-        protector tg(this);
+pc::sync::protector tg(keeper);
 
         if (getShare(position))

trunk/src/toolsLogger.cc

@@ -64 +64 @@
 logger::logger() : handlersNum(0),
                                    timeFormat(" %d/%m/%Y.%H-%M-%S: "),
-                                   forward(false)
+                                   forward(false),
+                                   keeper(new pc::sync::process::section)
 {
 }
@@ -72 +73 @@
 logger::~logger()
 {
+        delete keeper;
 }
 
@@ -79 +81 @@
                                                   io::channel *handler)
 {
-        protector tg(this);
+        pc::sync::protector pg(keeper);
 
         __logMap lm;
@@ -96 +98 @@
 void logger::remove(unsigned long position)
 {
-        protector tg(this);
+        pc::sync::protector pg(keeper);
 
         dodoList<__logMap>::iterator i(handlers.begin()), j(handlers.end());
@@ -115 +117 @@
                                  const dodoString &msg)
 {
-        protector tg(this);
+        pc::sync::protector pg(keeper);
 
         if (level < 0 && level >= LOGGER_LEVELS)

trunk/tests/pcprocesscollection_test/test.cc

@@ -13 +13 @@
 #include <libdodo/pcSyncProcessDataSingle.h>
 #include <libdodo/pcSyncProcessDataCollection.h>
+#include <libdodo/pcSyncProtector.h>
 
 #include <iostream>
@@ -47 +48 @@
                 cout << "Data: " << dt << endl, cout.flush();
                 shD.close();
-                
+
                 cout << (char *)dgC.get(dgCI), cout.flush();
-                
+
                 cout << (char *)dg0.acquire(1), cout.flush();
                 tools::os::microSleep(1000);
@@ -72 +73 @@
 processLocked(void *ud)
 {
-        sec.acquire();
-        
+        sync::protector pg(&sec);
+
         cout << "processLocked:" << (char *)ud << endl, cout.flush();
 
@@ -84 +85 @@
                 char *dt = (char *)shD.map(size);
                 cout << "Data: " << dt << endl, cout.flush();
-                
+
                 cout << (char *)dgC.get(dgCI), cout.flush();
-        
+
                 cout << (char *)dg0.acquire(), cout.flush();
                 dg0.release();
@@ -93 +94 @@
 
                 tools::os::sleep(1);
-                
+
                 cout << (char *)dg1.acquire(), cout.flush();
                 dg1.release();
@@ -103 +104 @@
                 cout << (dodoString)ex << ex.line << endl, cout.flush();
         }
-
-        sec.release();
 
         return 0;