Ticket #758: pjlib-test.diff

pjlib/src/pj/ioqueue_symbian.cpp

@@ -213 +213 @@
     } else {
         aAddress_.SetAddress(0);
         aAddress_.SetPort(0);
-        sock_->Socket().Recv(aBufferPtr_, flags, iStatus);
+
+        //sock_->Socket().Recv(aBufferPtr_, flags, iStatus);
+        static TSockXfrLength len;
+        sock_->Socket().RecvOneOrMore(aBufferPtr_, flags, iStatus, len);
     }
 
     SetActive();

pjlib/src/pjlib-test/main_symbian.cpp

@@ -44 +44 @@
 LOCAL_D CConsoleBase* console;  // write all messages to this
 
 
-//  Local Functions
-
-LOCAL_C void MainL()
-{
-    //
-    // add your program code here, example code below
-    //
-    test_main();
-
-    console->Printf(_L(" [press any key]\n"));
-    console->Getch();
-
-    CActiveScheduler::Stop();
-}
-
 class MyScheduler : public CActiveScheduler
 {
 public:
@@ -73 +58 @@
     PJ_UNUSED_ARG(aError);
 }
 
-class ProgramStarter : public CActive
-{
-public:
-    static ProgramStarter *NewL();
-    void Start();
-
-protected:
-    ProgramStarter();
-    void ConstructL();
-    virtual void RunL();
-    virtual void DoCancel();
-    TInt RunError(TInt aError);
-
-private:
-    RTimer timer_;
-};
-
-ProgramStarter::ProgramStarter()
-: CActive(EPriorityNormal)
-{
-}
-
-void ProgramStarter::ConstructL()
-{
-    timer_.CreateLocal();
-    CActiveScheduler::Add(this);
-}
-
-ProgramStarter *ProgramStarter::NewL()
-{
-    ProgramStarter *self = new (ELeave) ProgramStarter;
-    CleanupStack::PushL(self);
-
-    self->ConstructL();
-
-    CleanupStack::Pop(self);
-    return self;
-}
-
-void ProgramStarter::Start()
-{
-    timer_.After(iStatus, 0);
-    SetActive();
-}
-
-void ProgramStarter::RunL()
-{
-    MainL();
-}
-
-void ProgramStarter::DoCancel()
-{
-}
-
-TInt ProgramStarter::RunError(TInt aError)
-{
-    PJ_UNUSED_ARG(aError);
-    return KErrNone;
-}
-
-
 LOCAL_C void DoStartL()
     {
     // Create active scheduler (to run active objects)
@@ -141 +65 @@
     CleanupStack::PushL(scheduler);
     CActiveScheduler::Install(scheduler);
 
-    ProgramStarter *starter = ProgramStarter::NewL();
-    starter->Start();
+    test_main();
 
-    CActiveScheduler::Start();
+    CActiveScheduler::Install(NULL);
+    CleanupStack::Pop(scheduler);
+    delete scheduler;
     }
 
 
@@ -180 +105 @@
     TRAPD(mainError, DoStartL());
     if (mainError)
         console->Printf(_L(" failed, leave code = %d"), mainError);
+    
     console->Printf(_L(" [press any key]\n"));
     console->Getch();
     
     delete console;
     delete cleanup;
+    
+    CloseSTDLIB(); 
+    
     __UHEAP_MARKEND;
+    
     return KErrNone;
     }
 

pjlib/src/pjlib-test/activesock.c

@@ -212 +212 @@
 
         for (i=0; i<10 && last_rx1 == srv1->rx_cnt && last_rx2 == srv2->rx_cnt; ++i) {
             pj_time_val delay = {0, 10};
+#ifdef PJ_SYMBIAN
+            pj_symbianos_poll(-1, 100);
+#else
             pj_ioqueue_poll(ioqueue, &delay);
+#endif
         }
 
         if (srv1->rx_err_cnt+srv1->tx_err_cnt != 0 ||
@@ -403 +407 @@
         status = pj_activesock_send(asock2, &op_key->op_key, pkt, &len, 0);
         if (status == PJ_EPENDING) {
             do {
+#ifdef PJ_SYMBIAN
+                pj_symbianos_poll(-1, -1);
+#else
                 pj_ioqueue_poll(ioqueue, NULL);
+#endif
             } while (!state2->sent);
         } else if (status != PJ_SUCCESS) {
                 PJ_LOG(1,("", "   err: send status=%d", status));
@@ -420 +428 @@
 
     /* Wait until everything has been sent/received */
     if (state1->next_recv_seq < COUNT) {
+#ifdef PJ_SYMBIAN
+        while (pj_symbianos_poll(-1, 1000) == PJ_TRUE)
+            ;
+#else
         pj_time_val delay = {0, 100};
         while (pj_ioqueue_poll(ioqueue, &delay) > 0)
             ;
+#endif
     }
 
     if (status == PJ_EPENDING)

pjlib/src/pjlib-test/test.c

@@ -197 +197 @@
         PJ_LOG(3,("test", "Looks like everything is okay!.."));
     else
         PJ_LOG(3,("test", "Test completed with error(s)"));
+    
+    pj_shutdown();
+    
     return 0;
 }