USE_ALTERNATE_FORMATS = ON | OFF [ON] -- Use alternate formats for the phone
number matcher.
USE_BOOST = ON | OFF [ON] -- Use Boost. This is only needed in
- multi-threaded environments.
+ multi-threaded environments that
+ are not Linux and Mac.
+ Libphonenumber relies on Boost for
+ non-POSIX (e.g. Windows)
+ multi-threading.
USE_ICU_REGEXP = ON | OFF [ON] -- Use ICU regexp engine.
USE_LITE_METADATA = ON | OFF [OFF] -- Generates smaller metadata that
doesn't include example numbers.
// Author: Philippe Liard
-#ifndef I18N_PHONENUMBERS_BASE_SINGLETON_H_
-#define I18N_PHONENUMBERS_BASE_SINGLETON_H_
+#ifndef I18N_PHONENUMBERS_BASE_MEMORY_SINGLETON_H_
+#define I18N_PHONENUMBERS_BASE_MEMORY_SINGLETON_H_
#if defined(I18N_PHONENUMBERS_USE_BOOST)
template <class T> boost::scoped_ptr<T> Singleton<T>::instance;
template <class T> boost::once_flag Singleton<T>::flag = BOOST_ONCE_INIT;
+} // namespace phonenumbers
+} // namespace i18n
+
#else // !I18N_PHONENUMBERS_USE_BOOST
#include "phonenumbers/base/logging.h"
#include "phonenumbers/base/thread_checker.h"
+#if !defined(__linux__) && !defined(__APPLE__)
+
namespace i18n {
namespace phonenumbers {
// Note that this implementation is not thread-safe. For a thread-safe
-// implementation, please compile with -DI18N_PHONENUMBERS_USE_BOOST.
+// implementation on non-POSIX platforms, please compile with
+// -DI18N_PHONENUMBERS_USE_BOOST.
template <class T>
class Singleton {
public:
const ThreadChecker thread_checker_;
};
-#endif // !I18N_PHONENUMBERS_USE_BOOST
-
} // namespace phonenumbers
} // namespace i18n
-#endif // I18N_PHONENUMBERS_BASE_SINGLETON_H_
+#else
+#include "phonenumbers/base/memory/singleton_posix.h"
+#endif // !defined(__linux__) && !defined(__APPLE__)
+
+#endif // !I18N_PHONENUMBERS_USE_BOOST
+#endif // I18N_PHONENUMBERS_BASE_MEMORY_SINGLETON_H_
--- /dev/null
+// Copyright (C) 2013 The Libphonenumber Authors
+//
+// 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 I18N_PHONENUMBERS_BASE_MEMORY_SINGLETON_POSIX_H_
+#define I18N_PHONENUMBERS_BASE_MEMORY_SINGLETON_POSIX_H_
+
+#include <pthread.h>
+
+#include "phonenumbers/base/logging.h"
+
+namespace i18n {
+namespace phonenumbers {
+
+template <class T>
+class Singleton {
+ public:
+ virtual ~Singleton() {}
+
+ static T* GetInstance() {
+ const int ret = pthread_once(&once_control_, &Init);
+ (void) ret;
+ DCHECK_EQ(0, ret);
+ return instance_;
+ }
+
+ private:
+ static void Init() {
+ instance_ = new T();
+ }
+
+ static T* instance_; // Leaky singleton.
+ static pthread_once_t once_control_;
+};
+
+template <class T> T* Singleton<T>::instance_;
+template <class T> pthread_once_t Singleton<T>::once_control_ =
+ PTHREAD_ONCE_INIT;
+
+} // namespace phonenumbers
+} // namespace i18n
+
+#endif // I18N_PHONENUMBERS_BASE_MEMORY_SINGLETON_POSIX_H_
#include "phonenumbers/base/logging.h"
#include "phonenumbers/base/thread_checker.h"
+// Dummy lock implementation on non-POSIX platforms. If you are running on a
+// different platform and care about thread-safety, please compile with
+// -DI18N_PHONENUMBERS_USE_BOOST.
+#if !defined(__linux__) && !defined(__APPLE__)
+
namespace i18n {
namespace phonenumbers {
-// Dummy lock implementation. If you care about thread-safety, please compile
-// with -DI18N_PHONENUMBERS_USE_BOOST.
class Lock {
public:
Lock() : thread_checker_() {}
DCHECK(thread_checker_.CalledOnValidThread());
}
- // No need for Release() since Acquire() is a no-op and Release() is not used
- // in the codebase.
+ void Release() const {
+ DCHECK(thread_checker_.CalledOnValidThread());
+ }
private:
const ThreadChecker thread_checker_;
};
+} // namespace phonenumbers
+} // namespace i18n
+
+#else
+#include "phonenumbers/base/synchronization/lock_posix.h"
+#endif
+
+namespace i18n {
+namespace phonenumbers {
+
class AutoLock {
public:
- AutoLock(Lock& lock) {
- lock.Acquire();
+ AutoLock(Lock& lock) : lock_(lock) {
+ lock_.Acquire();
}
+
+ ~AutoLock() {
+ lock_.Release();
+ }
+
+ private:
+ Lock& lock_;
};
} // namespace phonenumbers
--- /dev/null
+// Copyright (C) 2013 The Libphonenumber Authors
+//
+// 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.
+
+// Author: Philippe Liard
+
+#ifndef I18N_PHONENUMBERS_BASE_SYNCHRONIZATION_LOCK_POSIX_H_
+#define I18N_PHONENUMBERS_BASE_SYNCHRONIZATION_LOCK_POSIX_H_
+
+#include <pthread.h>
+
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/logging.h"
+
+namespace i18n {
+namespace phonenumbers {
+
+class Lock {
+ public:
+ Lock() {
+ const int ret = pthread_mutex_init(&mutex_, NULL);
+ (void) ret;
+ DCHECK_EQ(0, ret);
+ }
+
+ ~Lock() {
+ const int ret = pthread_mutex_destroy(&mutex_);
+ (void) ret;
+ DCHECK_EQ(0, ret);
+ }
+
+ void Acquire() const {
+ int ret = pthread_mutex_lock(&mutex_);
+ (void) ret;
+ DCHECK_EQ(0, ret);
+ }
+
+ void Release() const {
+ int ret = pthread_mutex_unlock(&mutex_);
+ (void) ret;
+ DCHECK_EQ(0, ret);
+ }
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(Lock);
+
+ mutable pthread_mutex_t mutex_;
+};
+
+} // namespace phonenumbers
+} // namespace i18n
+
+#endif // I18N_PHONENUMBERS_BASE_SYNCHRONIZATION_LOCK_POSIX_H_
// Note that I18N_PHONENUMBERS_NO_THREAD_SAFETY must be defined only to let the
// user of the library know that it can't be used in a thread-safe manner when
// it is not depending on Boost.
-#if !defined(I18N_PHONENUMBERS_NO_THREAD_SAFETY)
+#if !defined(__linux__) && !defined(__APPLE__) && \
+ !defined(I18N_PHONENUMBERS_NO_THREAD_SAFETY)
#error Building without Boost, please provide \
-DI18N_PHONENUMBERS_NO_THREAD_SAFETY
#endif
projects / platform / upstream / libphonenumber.git / commitdiff