Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e0c8cd8 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge changes I5748f47d,I3f074933 

* changes:
  Add FastThread.h
  Add FastThreadState
parents 3a6c90aa 4cd161b5

services/audioflinger/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ LOCAL_STATIC_LIBRARIES := \ 
LOCAL_MODULE:= libaudioflinger

LOCAL_32_BIT_ONLY := true



LOCAL_SRC_FILES += FastMixer.cpp FastMixerState.cpp AudioWatchdog.cpp

LOCAL_SRC_FILES += FastMixer.cpp FastMixerState.cpp AudioWatchdog.cpp FastThreadState.cpp



LOCAL_CFLAGS += -DSTATE_QUEUE_INSTANTIATIONS='"StateQueueInstantiations.cpp"'

services/audioflinger/FastThread.h

0 → 100644
+38 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef ANDROID_AUDIO_FAST_THREAD_H

#define ANDROID_AUDIO_FAST_THREAD_H



#include <utils/Thread.h>



namespace android {



// FastThread is the common abstract base class of FastMixer and FastCapture

class FastThread : public Thread {



public:

            FastThread() : Thread(false /*canCallJava*/) { }

    virtual ~FastThread() { }



protected:

    virtual bool threadLoop() = 0;



};  // class FastThread



}   // android



#endif  // ANDROID_AUDIO_FAST_THREAD_H

services/audioflinger/FastThreadState.cpp

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "FastThreadState.h"



namespace android {



FastThreadState::FastThreadState() :

    mCommand(INITIAL), mColdFutexAddr(NULL), mColdGen(0), mNBLogWriter(NULL)

{

}



FastThreadState::~FastThreadState()

{

}



}   // namespace android

services/audioflinger/FastThreadState.h

0 → 100644
+48 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef ANDROID_AUDIO_FAST_THREAD_STATE_H

#define ANDROID_AUDIO_FAST_THREAD_STATE_H



#include <stdint.h>

#include <media/nbaio/NBLog.h>



namespace android {



// Represents a single state of a FastThread

struct FastThreadState {

                FastThreadState();

    /*virtual*/ ~FastThreadState();



    typedef uint32_t Command;

    static const Command

        INITIAL = 0,            // used only for the initial state

        HOT_IDLE = 1,           // do nothing

        COLD_IDLE = 2,          // wait for the futex

        IDLE = 3,               // either HOT_IDLE or COLD_IDLE

        EXIT = 4;               // exit from thread

        // additional values defined per subclass

    Command     mCommand;



    int32_t*    mColdFutexAddr; // for COLD_IDLE only, pointer to the associated futex

    unsigned    mColdGen;       // increment when COLD_IDLE is requested so it's only performed once



    NBLog::Writer* mNBLogWriter; // non-blocking logger

};  // struct FastThreadState



}   // android



#endif  // ANDROID_AUDIO_FAST_THREAD_STATE_H