changeset 366:1ff1bbf30472 plus

got the full chain running
author Henry S. Thompson <ht@inf.ed.ac.uk>
date Wed, 08 Apr 2026 13:51:00 +0100
parents a9ecdd85d205
children 4bae5b876418
files bin/cdb_chain.sh bin/cdbp.sh lib/python/cc/lmh/cdb_one.py
diffstat 3 files changed, 8 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/bin/cdb_chain.sh	Tue Apr 07 23:03:15 2026 +0100
+++ b/bin/cdb_chain.sh	Wed Apr 08 13:51:00 2026 +0100
@@ -1,16 +1,19 @@
 #!/usr/bin/bash
 # Chain together n steps of test_cdbp 
-# Usage cdb_chain n
+# Usage cdb_chain.sh n
 # First step takes stdin, intermediate steps use FIFOs, last step goes to stdout
 export PYTHONPATH=~/lib/python/cc/lmh
 n=$1
 mkdir -p /tmp/hst
 me=/tmp/hst/$$
 mkfifo ${me}_from0
-cat | { cdbp.sh 0 > ${me}_from0 ; } &
+cat | { cdbp.sh 0 > ${me}_from0 ;} &
 seq 1 $((n - 2)) | while read i ; do
  mkfifo ${me}_from$i
- { cdbp.sh $i < ${me}_from$((i - 1)) > ${me}_from$i ;  rm ${me}_from$((i - 1)) ; } &
+ { cdbp.sh $i < ${me}_from$((i - 1)) > ${me}_from$i ;  rm ${me}_from$((i - 1))
+  #echo f$((i - 1)) ended 1>&2
+ } &
 done
 cdbp.sh $((n - 1)) < ${me}_from$((n - 2))
+#echo f$((n - 2)) ended 1>&2
 rm ${me}_from$((n - 2))
--- a/bin/cdbp.sh	Tue Apr 07 23:03:15 2026 +0100
+++ b/bin/cdbp.sh	Wed Apr 08 13:51:00 2026 +0100
@@ -8,5 +8,5 @@
 k2=$((i < 4 ? k1 + 16 : k1 + 15))
 #echo $(printf lmh_%d-%d.cdb $k1 $((k2 - 1))) 1>&2
 #cat $(printf lmh_%d-%d.cdb $k1 $((k2 - 1))) > /dev/null
-python3 -c 'import cdb_one;cdb_one.mainp()' lmh_%d-%d.cdb $k1 $k2
+python3 -c 'import cdb_one;cdb_one.mainp()' lmh%d-%df.cdb $k1 $k2
 
--- a/lib/python/cc/lmh/cdb_one.py	Tue Apr 07 23:03:15 2026 +0100
+++ b/lib/python/cc/lmh/cdb_one.py	Wed Apr 08 13:51:00 2026 +0100
@@ -52,7 +52,7 @@
       raise ValueError(l)
     N += 1
     seg = int(segb)
-    print(seg, kind, offsetb, fnob,file=sys.stderr)
+    #print(seg, kind, offsetb, fnob,file=sys.stderr)
     if (seg >= S and seg <= E):
       M += 1
       shrink_key.set_sd_from_bytes(kind)