Changeset 3134

Timestamp:

Apr 7, 2010 10:24:41 AM (14 years ago)

Author:

nanang

Message:

Ticket #1055: Fixed infinite loop in stopping APS after initialization failed.

File:

• pjproject/trunk/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp (modified) (17 diffs)

pjproject/trunk/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp

@@ -45 +45 @@
 #define BITS_PER_SAMPLE                 16
 
+
 #if 1
 #   define TRACE_(st) PJ_LOG(3, st)
@@ -414 +415 @@
     TInt InitRecL();
     TInt StartStreamL();
+    void Deinit();
 
     // Inherited from MQueueHandlerObserver
@@ -420 +422 @@
     virtual void NotifyError(const TInt aError);
 
+    TBool                        session_opened;
     State                        state_;
     struct aps_stream           *parentStrm_;
@@ -430 +433 @@
     RMsgQueue<TAPSCommBuffer>    iReadQ;
     RMsgQueue<TAPSCommBuffer>    iReadCommQ;
+    TBool                        readq_opened;
     RMsgQueue<TAPSCommBuffer>    iWriteQ;
     RMsgQueue<TAPSCommBuffer>    iWriteCommQ;
+    TBool                        writeq_opened;
 
     CQueueHandler               *iPlayCommHandler;
@@ -461 +466 @@
                                const CPjAudioSetting &setting)
       : MQueueHandlerObserver(rec_cb, play_cb, user_data),
+        session_opened(EFalse),
         state_(STATE_NULL),
         parentStrm_(parent_strm),
         setting_(setting),
+        readq_opened(EFalse),
+        writeq_opened(EFalse),
         iPlayCommHandler(0),
         iRecCommHandler(0),
@@ -472 +480 @@
 CPjAudioEngine::~CPjAudioEngine()
 {
-    Stop();
-
-    delete iRecHandler;
-    delete iPlayCommHandler;
-    delete iRecCommHandler;
-
-    // On some devices, immediate closing after stopping may cause APS server
-    // panic KERN-EXEC 0, so let's wait for sometime before really closing
-    // the client session.
-    TTime start, now;
-    enum { APS_CLOSE_WAIT_TIME = 200 }; /* in msecs */
-    
-    start.UniversalTime();
-    do {
-        pj_symbianos_poll(-1, APS_CLOSE_WAIT_TIME);
-        now.UniversalTime();
-    } while (now.MicroSecondsFrom(start) < APS_CLOSE_WAIT_TIME * 1000);
-
-    iSession.Close();
-
-    if (state_ == STATE_READY) {
-        if (parentStrm_->param.dir != PJMEDIA_DIR_PLAYBACK) {
-            iReadQ.Close();
-            iReadCommQ.Close();
-        }
-        iWriteQ.Close();
-        iWriteCommQ.Close();
-    }
-    
+    Deinit();
+
     TRACE_((THIS_FILE, "Sound device destroyed"));
 }
@@ -508 +489 @@
     TInt err = iSession.InitializePlayer(iPlaySettings);
     if (err != KErrNone) {
+        Deinit();
         snd_perror("Failed to initialize player", err);
         return err;
@@ -522 +504 @@
     while (iWriteCommQ.OpenGlobal(buf3))
         User::After(10);
+        
+    writeq_opened = ETrue;
 
     // Construct message queue handler
@@ -538 +522 @@
     TInt err = iSession.InitializeRecorder(iRecSettings);
     if (err != KErrNone && err != KErrAlreadyExists) {
+        Deinit();
         snd_perror("Failed to initialize recorder", err);
         return err;
@@ -554 +539 @@
         User::After(10);
 
+    readq_opened = ETrue;
+
     // Construct message queue handlers
     iRecHandler = CQueueHandler::NewL(this, &iReadQ, NULL,
@@ -574 +561 @@
     PJ_ASSERT_RETURN(state_ == STATE_NULL, PJMEDIA_EAUD_INVOP);
     
+    if (!session_opened) {
+        TInt err = iSession.Connect();
+        if (err != KErrNone)
+            return err;
+        session_opened = ETrue;
+    }
+
     // Even if only capturer are opened, playback thread of APS Server need
     // to be run(?). Since some messages will be delivered via play comm queue.
@@ -593 +587 @@
         
         // Then wait until initialization done.
-        while (state_ != STATE_READY)
+        while (state_ != STATE_READY && state_ != STATE_NULL)
             pj_symbianos_poll(-1, 100);
     }
@@ -618 +612 @@
 
     User::LeaveIfError(iSession.Connect());
+    session_opened = ETrue;
 }
 
@@ -648 +643 @@
 }
 
+void CPjAudioEngine::Deinit()
+{
+    Stop();
+
+    delete iRecHandler;
+    delete iPlayCommHandler;
+    delete iRecCommHandler;
+
+    if (session_opened) {
+        TTime start, now;
+        enum { APS_CLOSE_WAIT_TIME = 200 }; /* in msecs */
+        
+        // On some devices, immediate closing after stopping may cause 
+        // APS server panic KERN-EXEC 0, so let's wait for sometime before
+        // closing the client session.
+        start.UniversalTime();
+        do {
+            pj_symbianos_poll(-1, APS_CLOSE_WAIT_TIME);
+            now.UniversalTime();
+        } while (now.MicroSecondsFrom(start) < APS_CLOSE_WAIT_TIME * 1000);
+
+        iSession.Close();
+        session_opened = EFalse;
+    }
+
+    if (readq_opened) {
+        iReadQ.Close();
+        iReadCommQ.Close();
+        readq_opened = EFalse;
+    }
+
+    if (writeq_opened) {
+        iWriteQ.Close();
+        iWriteCommQ.Close();
+        writeq_opened = EFalse;
+    }
+
+    state_ = STATE_NULL;
+}
+
 void CPjAudioEngine::InputStreamInitialized(const TInt aStatus)
 {
@@ -659 +694 @@
             state_ = STATE_READY;
         }
+    } else {
+        Deinit();
     }
 }
@@ -676 +713 @@
         } else
             InitRecL();
+    } else {
+        Deinit();
     }
 }
@@ -681 +720 @@
 void CPjAudioEngine::NotifyError(const TInt aError)
 {
+    Deinit();
     snd_perror("Error from CQueueHandler", aError);
 }