X-Git-Url: https://mop.ddnsfree.com/gitweb/?p=curl-de-sac.git;a=blobdiff_plain;f=webtest%2Fcds_test01.php;h=fd89bae4cb88e979822ecaa6b786b16eedfa90dc;hp=4a649aeeecda60abf7960a0d24909e94be6cd030;hb=aa32018692a341fb130b5632ab2a1a58041de239;hpb=3d134990bee924e6e833c5c22ef2cb65524769d7

diff --git a/webtest/cds_test01.php b/webtest/cds_test01.php
index 4a649ae..fd89bae 100755
--- a/webtest/cds_test01.php
+++ b/webtest/cds_test01.php
@@ -23,16 +23,18 @@ class short_cmd_cls extends CDS_cmd_cls {
 
     function create($cds, $url)
     {
-        printf("short::create url:[%s]\n", $url);
-        
+        if ($cds->dbg_get() > 0) {
+            printf("short::create url:[%s]\n", $url);
+        }
+
         do {
-            if (($ch = parent::pre_create($url)) == FALSE)
+            if (($ch = parent::pre_create($cds, $url)) == FALSE)
                 break;
 
             if (parent::create($cds, $ch) == FALSE)
                 break;
 
-            $cmd = new short_cmd($ch, $this, "none currently");
+            $cmd = new short_cmd($this, $ch, "none currently");
 
             return $cmd;
         } while (FALSE);
@@ -40,9 +42,19 @@ class short_cmd_cls extends CDS_cmd_cls {
         return FALSE;
     }
 
-    function cb()
+    function process($cmd, $ret)
     {
-        printf("short_cb:\n");
+        printf("CURL: curl_multi_getcontent\n");
+        $content = curl_multi_getcontent($cmd->ch_get());
+        if ($this->dbg_get() > 0) {
+            printf("short process: [%s]\n", $content);
+        }
+        return TRUE;
+    }
+
+    function timeout($cmd)
+    {
+        printf("Short timeout function reached\n");
     }
 }
 
@@ -59,21 +71,23 @@ class long_cmd extends CDS_cmd {
 class long_cmd_cls extends CDS_cmd_cls {
     function long_cmd_cls()
     {
-        parent::__construct("long", 10);
+        parent::__construct("long", 5);
     }
 
     function create($cds, $url)
     {
-        printf("long::create url:[%s]\n", $url);
-        
+        if ($cds->dbg_get() > 0) {
+            printf("long::create url:[%s]\n", $url);
+        }
+
         do {
-            if (($ch = parent::pre_create($url)) == FALSE)
+            if (($ch = parent::pre_create($cds, $url)) == FALSE)
                 break;
 
             if (parent::create($cds, $ch) == FALSE)
                 break;
 
-            $cmd = new long_cmd($ch, $this, "none currently");
+            $cmd = new long_cmd($this, $ch, "none currently");
 
             return $cmd;
         } while (FALSE);
@@ -81,91 +95,142 @@ class long_cmd_cls extends CDS_cmd_cls {
         return FALSE;
     }
 
-    function cb()
+    function process($cmd, $ret)
     {
-        printf("long_cb:\n");
+        printf("CURL: curl_multi_getcontent\n");
+        $content = curl_multi_getcontent($cmd->ch_get());
+        if ($this->dbg_get() > 0) {
+            printf("long process: [%s]\n", $content);
+        }
+
+        return TRUE;
+    }
+
+    function timeout($cmd)
+    {
+        printf("Long timeout function reached\n");
     }
 }
 
 
 function main()
 {
+    $debug = 998;
     // create cds
-    $cds = new Curl_de_sac(999);
+    $cds = new Curl_de_sac($debug);
 
     // create cds_cmd 1
-    $cmd_cls1 = new short_cmd_cls();
+    $short_cls = new short_cmd_cls();
 
     // registrer cds_cmd 1
-    printf("Register CLS1\n");
-    if (($cds->cmd_register($cmd_cls1)) == FALSE) {
-        fprintf(STDERR, "cmd_cls1 registration failed\n");
+    printf("MAIN: Register CLS1\n");
+    if (($cds->cmd_cls_register($short_cls)) == FALSE) {
+        fprintf(STDERR, "MAIN: cmd_cls1 registration failed\n");
         exit(1);
     }
 
     // create cds_cmd 2
-    $cmd_cls2 = new long_cmd_cls();
+    $long_cls = new long_cmd_cls();
 
     // register cds_cmd 2
-    printf("Register CLS2\n");
-    if (($cds->cmd_register($cmd_cls2)) == FALSE) {
-        fprintf(STDERR, "cmd_cls2 registration failed\n");
+    printf("MAIN: Register CLS2\n");
+    if (($cds->cmd_cls_register($long_cls)) == FALSE) {
+        fprintf(STDERR, "MAIN: cmd_cls2 registration failed\n");
         exit(2);
     }
 
     // register cds_cmd 2 (retry)
-    printf("Re-register CLS2 (must go wrong)\n");
-    if (($cds->cmd_register($cmd_cls2)) != FALSE) {
-        fprintf(STDERR, "cmd_cls2 re-registration success\n");
+    printf("MAIN: Re-register CLS2 (must go wrong)\n");
+    if (($cds->cmd_cls_register($long_cls)) != FALSE) {
+        fprintf(STDERR, "MAIN: cmd_cls2 re-registration success\n");
         exit(3);
     }
 
-    print_r($cds);
-    printf("Deregister CLS2\n");
-    if (($cds->cmd_deregister($cmd_cls2)) == FALSE) {
-        fprintf(STDERR, "cmd_cls2 deregistration failed\n");
+    printf("MAIN: CDS:\n");
+    if (($debug & 1) == 1)
+        print_r($cds);
+    printf("MAIN: Deregister CLS2\n");
+    if (($cds->cmd_cls_deregister($long_cls)) == FALSE) {
+        fprintf(STDERR, "MAIN: cmd_cls2 deregistration failed\n");
         exit(4);
     }
-    print_r($cds);
-
+    printf("MAIN:");
+    if (($debug & 1) == 1) {
+        printf(" CDS:\n");
+        print_r($cds);
+    }
+    printf("\n");
     // re-re-register cds_cmd 2
-    printf("Re-re-register CLS2\n");
-    if (($cds->cmd_register($cmd_cls2)) == FALSE) {
-        fprintf(STDERR, "cmd_cls2 re-re-registration failed\n");
+    printf("MAIN: Re-re-register CLS2\n");
+    if (($cds->cmd_cls_register($long_cls)) == FALSE) {
+        fprintf(STDERR, "MAIN: cmd_cls2 re-re-registration failed\n");
         exit(5);
     }
 
-    printf("Deregister all\n");
-    $cds->cmd_deregister_all();
+    printf("MAIN: Deregister all\n");
+    $cds->cmd_cls_deregister_all();
 
     // registrer cds_cmd 1
-    printf("Register CLS1\n");
-    if (($cds->cmd_register($cmd_cls1)) == FALSE) {
-        fprintf(STDERR, "cmd_cls1 registration failed\n");
+    printf("MAIN: register CLS1\n");
+    if (($cds->cmd_cls_register($short_cls, 10)) == FALSE) {
+        fprintf(STDERR, "MAIN: cmd_cls1 registration failed\n");
         exit(1);
     }
 
     // register cds_cmd 2
-    printf("Register CLS2\n");
-    if (($cds->cmd_register($cmd_cls2)) == FALSE) {
-        fprintf(STDERR, "cmd_cls2 registration failed\n");
+    printf("MAIN: register CLS2\n");
+    if (($cds->cmd_cls_register($long_cls, 4)) == FALSE) {
+        fprintf(STDERR, "MAIN: cmd_cls2 registration failed\n");
         exit(2);
     }
-    print_r($cds);
-    printf("SUCCESS\n");
+    printf("MAIN:");
+    if (($debug & 1) == 1) {
+        printf(" CDS:\n");
+        print_r($cds);
+    }
+    printf("\n");
+
+    // for ($i = -15 ; $i < 30 ; $i++) {
+    for ($i = 0 ; $i < 20 ; $i++) {
+        printf("MAIN: START ITERATION %d\n", $i);
+
+         if ($i == 2) {
+            printf("MAIN: load short\n");
+            if ($cds->execute("short", WEBURL.'/short.php') == FALSE) {
+                printf("MAIN: push command failed\n");
+                exit(123);
+            }
+        }
 
-    for ($i = 0 ; $i < 10 ; $i++) {
-        if ($i == 2) {
-            print("load short\n");
+         if ($i == 3) {
+            printf("MAIN: load short\n");
             if ($cds->execute("short", WEBURL.'/short.php') == FALSE) {
-                printf("push command failed\n");
+                printf("MAIN: push command failed\n");
                 exit(123);
             }
         }
-        printf("Call process\n");
+
+        if ($i == 4) {
+            printf("MAIN: load long\n");
+            if ($cds->execute("long", WEBURL.'/long.php') == FALSE) {
+                printf("MAIN: push command failed\n");
+                exit(123);
+            }
+        }
+
+        printf("MAIN:");
+        if (($debug & 1) == 1) {
+            printf(" CDS:\n");
+            print_r($cds);
+        }
+        printf("\n");
+
+        printf("MAIN: Call process\n");
         $cds->process();
         sleep(1);
     }
+    printf("MAIN: finished, dump cds:\n");
+    print_r($cds);
     // start loop
     //   print status
     //   if input data execute some command