diff options
author | Glenn Kasten <gkasten@google.com> | 2014-04-01 17:32:17 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-01 17:32:17 +0000 |
commit | 1e0c8cd8fad2108c8ea085748fcca2059e3ce4ab (patch) | |
tree | 27d07871207369abdba016641f900838fe6f7c28 /services/audioflinger | |
parent | 3a6c90aa0617666d9abc94c02b752d9eb3d64772 (diff) | |
parent | 4cd161b5bf7a8008d684db4b217ed84d1704e683 (diff) | |
download | frameworks_av-1e0c8cd8fad2108c8ea085748fcca2059e3ce4ab.zip frameworks_av-1e0c8cd8fad2108c8ea085748fcca2059e3ce4ab.tar.gz frameworks_av-1e0c8cd8fad2108c8ea085748fcca2059e3ce4ab.tar.bz2 |
Merge changes I5748f47d,I3f074933
* changes:
Add FastThread.h
Add FastThreadState
Diffstat (limited to 'services/audioflinger')
-rw-r--r-- | services/audioflinger/Android.mk | 2 | ||||
-rw-r--r-- | services/audioflinger/FastThread.h | 38 | ||||
-rw-r--r-- | services/audioflinger/FastThreadState.cpp | 30 | ||||
-rw-r--r-- | services/audioflinger/FastThreadState.h | 48 |
4 files changed, 117 insertions, 1 deletions
diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index 6cb0299..27e38a3 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -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"' diff --git a/services/audioflinger/FastThread.h b/services/audioflinger/FastThread.h new file mode 100644 index 0000000..6caf7bd --- /dev/null +++ b/services/audioflinger/FastThread.h @@ -0,0 +1,38 @@ +/* + * 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 diff --git a/services/audioflinger/FastThreadState.cpp b/services/audioflinger/FastThreadState.cpp new file mode 100644 index 0000000..427ada5 --- /dev/null +++ b/services/audioflinger/FastThreadState.cpp @@ -0,0 +1,30 @@ +/* + * 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 diff --git a/services/audioflinger/FastThreadState.h b/services/audioflinger/FastThreadState.h new file mode 100644 index 0000000..148fb7b --- /dev/null +++ b/services/audioflinger/FastThreadState.h @@ -0,0 +1,48 @@ +/* + * 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 |