2011-12-17 07:55:08 -06:00
|
|
|
# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
|
|
|
|
|
#
|
|
|
|
|
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
|
|
|
|
|
#
|
|
|
|
|
# The contents of this file are subject to the Mozilla Public License Version
|
|
|
|
|
# 1.1 (the "License"); you may not use this file except in compliance with
|
|
|
|
|
# the License or as specified alternatively below. You may obtain a copy of
|
|
|
|
|
# the License at http://www.mozilla.org/MPL/
|
|
|
|
|
#
|
|
|
|
|
# Software distributed under the License is distributed on an "AS IS" basis,
|
|
|
|
|
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
|
|
|
|
# for the specific language governing rights and limitations under the
|
|
|
|
|
# License.
|
|
|
|
|
#
|
|
|
|
|
# Major Contributor(s):
|
|
|
|
|
# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com>
|
|
|
|
|
#
|
|
|
|
|
# All Rights Reserved.
|
|
|
|
|
#
|
|
|
|
|
# For minor contributions see the git repository.
|
|
|
|
|
#
|
|
|
|
|
# Alternatively, the contents of this file may be used under the terms of
|
|
|
|
|
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
|
|
|
|
|
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
|
|
|
|
|
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
|
|
|
|
|
# instead of those above.
|
|
|
|
|
|
|
|
|
|
$(eval $(call gb_Library_Library,cppu))
|
|
|
|
|
|
|
|
|
|
$(eval $(call gb_Library_set_soversion_script,cppu,3,$(SRCDIR)/cppu/util/cppu.map))
|
|
|
|
|
|
2013-02-26 16:57:15 -06:00
|
|
|
$(eval $(call gb_Library_use_package,cppu,cppu_odk_headers))
|
2011-12-17 07:55:08 -06:00
|
|
|
|
2013-02-25 04:08:29 -06:00
|
|
|
$(eval $(call gb_Library_use_udk_api,cppu))
|
2011-12-17 07:55:08 -06:00
|
|
|
|
2011-12-17 21:56:57 -06:00
|
|
|
$(eval $(call gb_Library_add_defs,cppu,\
|
|
|
|
|
-DCPPU_DLLIMPLEMENTATION \
|
|
|
|
|
))
|
|
|
|
|
|
2013-01-26 14:19:13 -06:00
|
|
|
$(eval $(call gb_Library_use_external,cppu,boost_headers))
|
|
|
|
|
|
2012-04-07 16:22:08 -05:00
|
|
|
$(eval $(call gb_Library_use_libraries,cppu,\
|
2011-12-17 07:55:08 -06:00
|
|
|
sal \
|
Better fix for ThreadPool/ORequestThread life cycle
This is a follow up to d015384e1d98fe77fd59339044f58efb1ab9fb25 "Fixed
ThreadPool (and dependent ORequestThread) life cycle" that still had some
problems:
* First, if Bridge::terminate was first entered from the reader or writer
thread, it would not join on that thread, so that thread could still be running
during exit.
That has been addressed by giving Bridge::dispose new semantics: It waits until
both Bridge::terminate has completed (even if that was called from a different
thread) and all spawned threads (reader, writer, ORequestThread workers) have
been joined. (This implies that Bridge::dispose must not be called from such a
thread, to avoid deadlock.)
* Second, if Bridge::terminate was first entered from an ORequestThread, the
call to uno_threadpool_dispose(0) to join on all such worker threads could
deadlock.
That has been addressed by making the last call to uno_threadpool_destroy wait
to join on all worker threads, and by calling uno_threadpool_destroy only from
the final Bridge::terminate (from Bridge::dispose), to avoid deadlock. (The
special semantics of uno_threadpool_dispose(0) are no longer needed and have
been removed, as they conflicted with the fix for the third problem below.)
* Third, once uno_threadpool_destroy had called uno_threadpool_dispose(0), the
ThreadAdmin singleton had been disposed, so no new remote bridges could
successfully be created afterwards.
That has been addressed by making ThreadAdmin a member of ThreadPool, and making
(only) those uno_ThreadPool handles with overlapping life spans share one
ThreadPool instance (which thus is no longer a singleton, either).
Additionally, ORequestThread has been made more robust (in the style of
salhelper::Thread) to avoid races.
Change-Id: I2cbd1b3f9aecc1bf4649e482d2c22b33b471788f
2012-05-23 02:42:37 -05:00
|
|
|
salhelper \
|
2012-09-26 16:45:28 -05:00
|
|
|
$(gb_UWINAPI) \
|
2011-12-17 07:55:08 -06:00
|
|
|
))
|
|
|
|
|
|
|
|
|
|
$(eval $(call gb_Library_add_cobjects,cppu,\
|
|
|
|
|
cppu/source/uno/EnvDcp \
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
$(eval $(call gb_Library_add_exception_objects,cppu,\
|
|
|
|
|
cppu/source/cppu/cppu_opt \
|
|
|
|
|
cppu/source/threadpool/current \
|
|
|
|
|
cppu/source/threadpool/jobqueue \
|
|
|
|
|
cppu/source/threadpool/thread \
|
|
|
|
|
cppu/source/threadpool/threadident \
|
|
|
|
|
cppu/source/threadpool/threadpool \
|
|
|
|
|
cppu/source/typelib/static_types \
|
|
|
|
|
cppu/source/typelib/typelib \
|
|
|
|
|
cppu/source/uno/any \
|
|
|
|
|
cppu/source/uno/cascade_mapping \
|
|
|
|
|
cppu/source/uno/data \
|
|
|
|
|
cppu/source/uno/EnvStack \
|
|
|
|
|
cppu/source/uno/env_subst \
|
|
|
|
|
cppu/source/uno/IdentityMapping \
|
|
|
|
|
cppu/source/uno/lbenv \
|
|
|
|
|
cppu/source/uno/lbmap \
|
|
|
|
|
cppu/source/uno/loadmodule \
|
|
|
|
|
cppu/source/uno/sequence \
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
# vim: set noet sw=4 ts=4:
|
