Arquivos
hhvm/hphp/util/async_func.cpp
T
Todd Nowacki 6d8999b7c1 Simple HPHP Changes for HPHP with Clang
Some simple changes for HPHP to help make it clang friendly

---hphp/compiler/package.cpp
---hphp/compiler/package.h
---hphp/runtime/ext/ext_curl.cpp
---hphp/runtime/ext/pdo_mysql.cpp
---hphp/tools/tc-print/offline-x86-code.h
---hphp/util/async_func.cpp
---hphp/util/async_func.h
---hphp/util/compression.cpp
---hphp/util/compression.h
---hphp/util/db_conn.cpp
---hphp/util/db_conn.h
  Deleted unused private fields

~~~hphp/compiler/analysis/symbol_table.h
  Static assert had to be outside the union

+++hphp/runtime/TARGETS
  Added clang specific flag to supress unneded declaration warning

~~~hphp/runtime/base/datatype.h
  Use of logical '&&' with constant operand. Added !=0 to remove warning,

~~~hphp/runtime/base/string_data.h
  Static fields cannot be declared in an anonymous struct/union

~~~hphp/runtime/ext/bcmath/TARGETS
  Moved gcc specific flag from preprocessor_flags to compiler_specific_flags

~---hphp/runtime/ext/pdo_mysql.cpp
  Removed unnecessary self asignment for row_count

~~~hphp/runtime/vm/bytecode.h
  Added default return statement

~---hphp/runtime/vm/jit/codegen.cpp
  spillSlotsToSize was unused

~~~hphp/runtime/vm/jit/irtranslator.cpp
~~~hphp/runtime/vm/jit/linearscan.cpp
  The c++ standard states default arguments shall not be specified in the
  parameter-declaration-clause of a lambda-declarator.

~~~hphp/runtime/vm/jit/vectortranslator-internal.h
  Clang had some issues determining the correct cast when these macros were used
  A simple '!= 0' check was added to make things explicit for clang.

~~~hphp/tools/tc-print/perf-events.h
  Added parens to make clang happy

+++hphp/util/asm-x64.h
  The constexpr needed to be initialized

+++hphp/util/base.h
  Clang also supports tr1 libraries

~~~hphp/util/bits.h
  Again, clang had issues with implicit casting to bool.
  added != 0 check

~~~hphp/util/malloc_size_class.h
  Ambiguous operator precedence. Added parentheses.

~~~hphp/util/thread_local.h
  Misspelled function
2013-06-28 10:33:52 -07:00

131 linhas
3.6 KiB
C++

/*
+----------------------------------------------------------------------+
| HipHop for PHP |
+----------------------------------------------------------------------+
| Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.php.net/license/3_01.txt |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
*/
#include "hphp/util/async_func.h"
namespace HPHP {
///////////////////////////////////////////////////////////////////////////////
typedef void PFN_THREAD_FUNC(void *);
PFN_THREAD_FUNC* AsyncFuncImpl::s_initFunc = nullptr;
void* AsyncFuncImpl::s_initFuncArg = nullptr;
PFN_THREAD_FUNC* AsyncFuncImpl::s_finiFunc = nullptr;
void* AsyncFuncImpl::s_finiFuncArg = nullptr;
AsyncFuncImpl::AsyncFuncImpl(void *obj, PFN_THREAD_FUNC *func)
: m_obj(obj), m_func(func),
m_threadStack(nullptr), m_threadId(0),
m_exception(nullptr), m_stopped(false), m_noInit(false) {
}
AsyncFuncImpl::~AsyncFuncImpl() {
assert(m_stopped || m_threadId == 0);
delete m_exception;
}
void *AsyncFuncImpl::ThreadFunc(void *obj) {
Util::init_stack_limits(((AsyncFuncImpl*)obj)->getThreadAttr());
((AsyncFuncImpl*)obj)->threadFuncImpl();
return nullptr;
}
void AsyncFuncImpl::start() {
struct rlimit rlim;
// Allocate the thread-stack
pthread_attr_init(&m_attr);
if (getrlimit(RLIMIT_STACK, &rlim) != 0 || rlim.rlim_cur == RLIM_INFINITY ||
rlim.rlim_cur < m_stackSizeMinimum) {
rlim.rlim_cur = m_stackSizeMinimum;
}
// On Success use the allocated memory for the thread's stack
if (posix_memalign(&m_threadStack, Util::s_pageSize, rlim.rlim_cur) == 0) {
pthread_attr_setstack(&m_attr, m_threadStack, rlim.rlim_cur);
}
pthread_create(&m_threadId, &m_attr, ThreadFunc, (void*)this);
assert(m_threadId);
}
void AsyncFuncImpl::cancel() {
pthread_cancel(m_threadId);
}
bool AsyncFuncImpl::waitForEnd(int seconds /* = 0 */) {
if (m_threadId == 0) return true;
{
Lock lock(m_stopMonitor.getMutex());
while (!m_stopped) {
if (seconds > 0) {
if (!m_stopMonitor.wait(seconds)) {
// wait timed out
return false;
}
} else {
m_stopMonitor.wait();
}
}
}
void *ret = nullptr;
pthread_join(m_threadId, &ret);
m_threadId = 0;
if (m_threadStack != nullptr) {
free(m_threadStack);
m_threadStack = nullptr;
}
if (Exception* e = m_exception) {
m_exception = 0;
e->throwException();
}
return true;
}
void AsyncFuncImpl::threadFuncImpl() {
if (s_initFunc && !m_noInit) {
s_initFunc(s_initFuncArg);
}
try {
m_func(m_obj);
} catch (Exception &e) {
m_exception = e.clone();
} catch (std::exception &e) {
m_exception = new Exception("%s", e.what());
} catch (...) {
m_exception = new Exception("(unknown exception)");
}
{
Lock lock(m_stopMonitor.getMutex());
m_stopped = true;
m_stopMonitor.notify();
}
if (s_finiFunc) {
s_finiFunc(s_finiFuncArg);
}
}
///////////////////////////////////////////////////////////////////////////////
}