am c74034b6: am 24651682: added BinderService<> template to help creating native binder services (9382d111) · Commits · e / os / platform_frameworks_native

cmds/surfaceflinger/main_surfaceflinger.cpp

+19 −12

Original line number	Diff line number	Diff line
		#include <binder/IPCThreadState.h>
		#include <binder/ProcessState.h>
		#include <binder/IServiceManager.h>
		#include <utils/Log.h>
		/*
		* Copyright (C) 2010 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 <binder/BinderService.h>
		#include <SurfaceFlinger.h>

		using namespace android;

		int main(int argc, char** argv)
		{
		sp<ProcessState> proc(ProcessState::self());
		sp<IServiceManager> sm = defaultServiceManager();
		LOGI("ServiceManager: %p", sm.get());
		SurfaceFlinger::instantiate();
		ProcessState::self()->startThreadPool();
		IPCThreadState::self()->joinThreadPool();
		int main(int argc, char** argv) {
		SurfaceFlinger::publishAndJoinThreadPool();
		return 0;
		}

include/binder/BinderService.h

0 → 100644

+60 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 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_BINDER_SERVICE_H
		#define ANDROID_BINDER_SERVICE_H

		#include <stdint.h>

		#include <utils/Errors.h>
		#include <utils/String16.h>

		#include <binder/IServiceManager.h>
		#include <binder/IPCThreadState.h>
		#include <binder/ProcessState.h>
		#include <binder/IServiceManager.h>

		// ---------------------------------------------------------------------------
		namespace android {

		template<typename SERVICE>
		class BinderService
		{
		public:
		static status_t publish() {
		sp<IServiceManager> sm(defaultServiceManager());
		return sm->addService(String16(SERVICE::getServiceName()), new SERVICE());
		}

		static void publishAndJoinThreadPool() {
		sp<ProcessState> proc(ProcessState::self());
		sp<IServiceManager> sm(defaultServiceManager());
		sm->addService(String16(SERVICE::getServiceName()), new SERVICE());
		ProcessState::self()->startThreadPool();
		IPCThreadState::self()->joinThreadPool();
		}

		static void instantiate() { publish(); }

		static status_t shutdown() {
		return NO_ERROR;
		}
		};


		}; // namespace android
		// ---------------------------------------------------------------------------
		#endif // ANDROID_BINDER_SERVICE_H

services/surfaceflinger/SurfaceFlinger.cpp

+0 −14

Original line number	Diff line number	Diff line
		@@ -63,20 +63,6 @@
		#define DISPLAY_COUNT 1

		namespace android {

		// ---------------------------------------------------------------------------

		void SurfaceFlinger::instantiate() {
		defaultServiceManager()->addService(
		String16("SurfaceFlinger"), new SurfaceFlinger());
		}

		void SurfaceFlinger::shutdown() {
		// we should unregister here, but not really because
		// when (if) the service manager goes away, all the services
		// it has a reference to will leave too.
		}

		// ---------------------------------------------------------------------------

		SurfaceFlinger::LayerVector::LayerVector(const SurfaceFlinger::LayerVector& rhs)

services/surfaceflinger/SurfaceFlinger.h

+6 −3

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@

		#include <binder/IMemory.h>
		#include <binder/Permission.h>
		#include <binder/BinderService.h>

		#include <ui/PixelFormat.h>
		#include <surfaceflinger/ISurfaceComposer.h>
		@@ -167,11 +168,13 @@ enum {
		eTraversalNeeded = 0x02
		};

		class SurfaceFlinger : public BnSurfaceComposer, protected Thread
		class SurfaceFlinger :
		public BinderService<SurfaceFlinger>,
		public BnSurfaceComposer,
		protected Thread
		{
		public:
		static void instantiate();
		static void shutdown();
		static char const* getServiceName() { return "SurfaceFlinger"; }

		SurfaceFlinger();
		virtual ~SurfaceFlinger();