Permalink
Browse files

remove readpstlog, switch to plain ascii debug log files

  • Loading branch information...
Carl Byington
Carl Byington committed May 18, 2009
1 parent 6b403b3 commit 0faa1a2b6c6f1106c028f9821860d1c1f5b6335b
Showing with 431 additions and 1,040 deletions.
  1. +2 −0 ChangeLog
  2. +0 −4 TODO
  3. +2 −0 libpst.spec.in
  4. +33 −37 regression/regression-tests.bash
  5. +2 −7 src/Makefile.am
  6. +98 −384 src/debug.c
  7. +27 −156 src/define.h
  8. +1 −2 src/dumpblocks.c
  9. +9 −9 src/getidblock.c
  10. +127 −126 src/libpst.c
  11. +13 −14 src/lspst.c
  12. +13 −14 src/pst2dii.cpp.in
  13. +1 −2 src/pst2ldif.cpp
  14. +99 −90 src/readpst.c
  15. +4 −195 xml/libpst.in
View
@@ -11,6 +11,8 @@ LibPST 0.6.38 (2009-xx-xx)
* decode more recurrence mapi elements.
* change interfaces to be thread safe.
* readpst changes for parallel operation on multi processor machines.
+ * remove readpstlog - the debug log files are now plain ascii. Add locking
+ if needed so parallel jobs can produce debug logs.
LibPST 0.6.37 (2009-04-17)
===============================
View
4 TODO
@@ -6,7 +6,3 @@ pst2diii needs header and mime type updates from readpst.
At the next soname bump (to libpst.so.5) we should
move some of readpst into the shared library, in particular write_normal_email()
- remove readpstlog, and produce ascii debug log files
- add debug FILE* into the pst_file structure, so all debug printing
- will be passed the pst_file struct. Also add a semaphore in there
- to synchronize debug printing.
View
@@ -152,6 +152,8 @@ rm -rf $RPM_BUILD_ROOT
- add python interface to the shared library.
- bump soname to version 4 for many changes to the interface.
- better decoding of recurrence data in appointments.
+- remove readpstlog since debug log files are now plain text.
+- add readpst -j option for parallel jobs for each folder.
* Fri Apr 17 2009 Carl Byington <carl@five-ten-sg.com> - 0.6.37-1
- add pst_attach_to_mem() back into the shared library interface.
@@ -49,17 +49,13 @@ function dopst()
fn="$2"
echo $fn
ba=$(basename "$fn" .pst)
+ jobs=""
+ [ -n "$val" ] && jobs="-j 0"
rm -rf output$n
mkdir output$n
- # ../src/readpst -cv -o output$n $fn >$ba.err 2>&1
- # readpst -cv -o output$n -d dumper $fn >$ba.err 2>&1
- $val ../src/readpst -r -D -cv -o output$n $fn
- # $val ../src/readpst -r -D -cv -o output$n -d dumper $fn >$ba.err 2>&1
- # ../src/readpstlog -f I dumper >$ba.log
-
- #../src/getidblock -d -p $fn 0 >$ba.fulldump
- #../src/readpstlog -f I getidblock.log >$ba.fulldump.log
-
+ #val ../src/readpst $jobs -r -D -cv -o output$n $fn
+ $val ../src/readpst $jobs -r -D -cv -o output$n -d $ba.log $fn >$ba.err 2>&1
+ #../src/getidblock -p $fn 0 >$ba.fulldump
#rm -f dumper
}
@@ -95,38 +91,38 @@ elif [ "$1" == "ldif" ]; then
doldif 13 test-text.pst
doldif 14 joe.romanowski.pst
doldif 15 hourig1.pst
- #doldif 16 hourig2.pst
- #doldif 17 hourig3.pst
+ doldif 16 hourig2.pst
+ doldif 17 hourig3.pst
doldif 18 test-mac.pst
- #doldif 19 harris.pst
+ doldif 19 harris.pst
doldif 20 spam.pst
- dolif 21 rendgen.pst
+ doldif 21 rendgen.pst
else
- #dopst 1 ams.pst
- #dopst 2 sample_64.pst
- #dopst 3 test.pst
- #dopst 4 big_mail.pst
- #dopst 5 mbmg.archive.pst
- #dopst 6 Single2003-read.pst
- #dopst 7 Single2003-unread.pst
- #dopst 8 ol2k3high.pst
- #dopst 9 ol97high.pst
- #dopst 10 returned_message.pst
- #dopst 11 flow.pst
- #dopst 12 test-html.pst
- #dopst 13 test-text.pst
- #dopst 14 joe.romanowski.pst
- #dopst 15 hourig1.pst
- dopst 16 hourig2.pst
+ dopst 1 ams.pst
+ dopst 2 sample_64.pst
+ dopst 3 test.pst
+ dopst 4 big_mail.pst
+ dopst 5 mbmg.archive.pst
+ dopst 6 Single2003-read.pst
+ dopst 7 Single2003-unread.pst
+ dopst 8 ol2k3high.pst
+ dopst 9 ol97high.pst
+ dopst 10 returned_message.pst
+ dopst 11 flow.pst
+ dopst 12 test-html.pst
+ dopst 13 test-text.pst
+ dopst 14 joe.romanowski.pst
+ dopst 15 hourig1.pst
+ #dopst 16 hourig2.pst
#dopst 17 hourig3.pst
- #dopst 18 test-mac.pst
- #dopst 19 harris.pst
- #dopst 20 spam.pst
- #dopst 21 rendgen.pst # single email appointment
- #dopst 22 rendgen2.pst # email appointment with no termination date
- #dopst 23 rendgen3.pst # mime signed email
- #dopst 24 rendgen4.pst # appointment test cases
- #dopst 25 rendgen5.pst # appointment test cases
+ dopst 18 test-mac.pst
+ dopst 19 harris.pst
+ dopst 20 spam.pst
+ dopst 21 rendgen.pst # single email appointment
+ dopst 22 rendgen2.pst # email appointment with no termination date
+ dopst 23 rendgen3.pst # mime signed email
+ dopst 24 rendgen4.pst # appointment test cases
+ dopst 25 rendgen5.pst # appointment test cases
fi
grep 'lost:' *err | grep -v 'lost: 0 '
View
@@ -32,13 +32,12 @@ if NEED_XGETOPT
endif
noinst_PROGRAMS = deltasearch dumpblocks getidblock
-bin_PROGRAMS = lspst readpst readpstlog pst2ldif
+bin_PROGRAMS = lspst readpst pst2ldif
if BUILD_DII
bin_PROGRAMS += pst2dii
endif
lspst_SOURCES = lspst.c $(common_header)
readpst_SOURCES = readpst.c $(common_header)
-readpstlog_SOURCES = readpstlog.c $(common_header)
pst2ldif_SOURCES = pst2ldif.cpp $(common_header)
pst2dii_SOURCES = pst2dii.cpp $(common_header)
deltasearch_SOURCES = deltasearch.cpp $(common_header)
@@ -47,7 +46,6 @@ getidblock_SOURCES = getidblock.c $(common_header)
lspst_CFLAGS = $(AM_CFLAGS)
readpst_CFLAGS = $(AM_CFLAGS)
-readpstlog_CFLAGS = $(AM_CFLAGS)
pst2ldif_CFLAGS = $(AM_CFLAGS)
pst2dii_CFLAGS = $(AM_CFLAGS)
deltasearch_CFLAGS = $(AM_CFLAGS)
@@ -56,7 +54,6 @@ getidblock_CFLAGS = $(AM_CFLAGS)
lspst_DEPENDENCIES = libpst.la
readpst_DEPENDENCIES = libpst.la
-readpstlog_DEPENDENCIES = libpst.la
pst2ldif_DEPENDENCIES = libpst.la
pst2dii_DEPENDENCIES = libpst.la
deltasearch_DEPENDENCIES = libpst.la
@@ -81,8 +78,7 @@ endif
libpst_la_SOURCES = $(common_source) $(common_header)
libpst_la_LIBADD = $(LTLIBICONV)
-
-EXTRA_DIST = testdebug.c
+EXTRA_DIST =
if !NEED_XGETOPT
EXTRA_DIST += XGetopt.c XGetopt.h
endif
@@ -93,7 +89,6 @@ INCLUDES= -I$(srcdir)/.. $(all_includes)
# the library search path.
lspst_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV)
readpst_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) $(REGEXLIB)
-readpstlog_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV)
pst2ldif_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV)
pst2dii_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) -lgd
dumpblocks_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV)
Oops, something went wrong.

0 comments on commit 0faa1a2

Please sign in to comment.