Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "fix assertion" 

This reverts commit 9e1ffac077452187acd4d652b4480495f4a2b608.
This commit is contained in:
Jan Steemann 2015-08-14 11:37:39 +02:00
parent 0aa3bb6104
commit 006bf3d2c1
3 changed files with 251 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
arangod/V8Server/V8Job.cpp
View File

@ -93,7 +93,7 @@ Job::status_t V8Job::work () {
ApplicationV8::V8Context* context = _v8Dealer->enterContext(_vocbase, _allowUseDatabase); ApplicationV8::V8Context* context = _v8Dealer->enterContext(_vocbase, _allowUseDatabase);
// note: the context might be nullptr in case of shut-down // note: the context might be 0 in case of shut-down
if (context == nullptr) { if (context == nullptr) {
return status_t(JOB_DONE); return status_t(JOB_DONE);
} }
@ -113,44 +113,47 @@ Job::status_t V8Job::work () {
v8::Handle<v8::Function> action = v8::Local<v8::Function>::Cast(function); v8::Handle<v8::Function> action = v8::Local<v8::Function>::Cast(function);
if (! action.IsEmpty()) { if (action.IsEmpty()) {
// only go in here if action code can be compiled _v8Dealer->exitContext(context);
v8::Handle<v8::Value> fArgs; // TODO: adjust exit code??
return status_t(JOB_DONE);
}
if (_parameters != nullptr) { v8::Handle<v8::Value> fArgs;
fArgs = TRI_ObjectJson(isolate, _parameters);
}
else {
fArgs = v8::Undefined(isolate);
}
// call the function within a try/catch if (_parameters != nullptr) {
try { fArgs = TRI_ObjectJson(isolate, _parameters);
v8::TryCatch tryCatch; }
else {
fArgs = v8::Undefined(isolate);
}
action->Call(current, 1, &fArgs); // call the function within a try/catch
try {
v8::TryCatch tryCatch;
if (tryCatch.HasCaught()) { action->Call(current, 1, &fArgs);
if (tryCatch.CanContinue()) {
TRI_LogV8Exception(isolate, &tryCatch);
}
else {
TRI_GET_GLOBALS();
v8g->_canceled = true; if (tryCatch.HasCaught()) {
LOG_WARNING("caught non-catchable exception (aka termination) in periodic job"); if (tryCatch.CanContinue()) {
} TRI_LogV8Exception(isolate, &tryCatch);
}
else {
TRI_GET_GLOBALS();
v8g->_canceled = true;
LOG_WARNING("caught non-catchable exception (aka termination) in periodic job");
} }
} }
catch (triagens::basics::Exception const& ex) { }
LOG_ERROR("caught exception in V8 job: %s %s", TRI_errno_string(ex.code()), ex.what()); catch (triagens::basics::Exception const& ex) {
} LOG_ERROR("caught exception in V8 job: %s %s", TRI_errno_string(ex.code()), ex.what());
catch (std::bad_alloc const&) { }
LOG_ERROR("caught exception in V8 job: %s", TRI_errno_string(TRI_ERROR_OUT_OF_MEMORY)); catch (std::bad_alloc const&) {
} LOG_ERROR("caught exception in V8 job: %s", TRI_errno_string(TRI_ERROR_OUT_OF_MEMORY));
catch (...) { }
LOG_ERROR("caught unknown exception in V8 job"); catch (...) {
} LOG_ERROR("caught unknown exception in V8 job");
} }
} }

97
lib/Scheduler/AsyncTask.cpp Normal file
View File

@ -0,0 +1,97 @@
////////////////////////////////////////////////////////////////////////////////
/// @brief tasks used to handle asynchronous events
///
/// @file
///
/// DISCLAIMER
///
/// Copyright 2014 ArangoDB GmbH, Cologne, Germany
/// Copyright 2004-2014 triAGENS GmbH, Cologne, Germany
///
/// 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.
///
/// Copyright holder is ArangoDB GmbH, Cologne, Germany
///
/// @author Dr. Frank Celler
/// @author Achim Brandt
/// @author Copyright 2014, ArangoDB GmbH, Cologne, Germany
/// @author Copyright 2008-2013, triAGENS GmbH, Cologne, Germany
////////////////////////////////////////////////////////////////////////////////
#include "AsyncTask.h"
#include "Basics/logging.h"
#include "Scheduler/Scheduler.h"
using namespace triagens::rest;
// -----------------------------------------------------------------------------
// constructors and destructors
// -----------------------------------------------------------------------------
AsyncTask::AsyncTask ()
: Task("AsyncTask"),
watcher(nullptr) {
}
AsyncTask::~AsyncTask () {
}
// -----------------------------------------------------------------------------
// public methods
// -----------------------------------------------------------------------------
void AsyncTask::signal () {
_scheduler->sendAsync(watcher);
}
// -----------------------------------------------------------------------------
// Task methods
// -----------------------------------------------------------------------------
bool AsyncTask::setup (Scheduler* scheduler,
EventLoop loop) {
this->_scheduler = scheduler;
this->_loop = loop;
// will throw if it goes wrong...
watcher = scheduler->installAsyncEvent(loop, this);
return true;
}
void AsyncTask::cleanup () {
if (_scheduler != nullptr) {
if (watcher != nullptr) {
_scheduler->uninstallEvent(watcher);
}
}
watcher = nullptr;
}
bool AsyncTask::handleEvent (EventToken token, EventType revents) {
if (watcher == token && (revents & EVENT_ASYNC)) {
return handleAsync();
}
return true;
}
// -----------------------------------------------------------------------------
// --SECTION-- END-OF-FILE
// -----------------------------------------------------------------------------
// Local Variables:
// mode: outline-minor
// outline-regexp: "/// @brief\\|/// {@inheritDoc}\\|/// @page\\|// --SECTION--\\|/// @\\}"
// End:

119
lib/Scheduler/AsyncTask.h Normal file
View File

@ -0,0 +1,119 @@
////////////////////////////////////////////////////////////////////////////////
/// @brief tasks used to handle asynchronous events
///
/// @file
///
/// DISCLAIMER
///
/// Copyright 2014 ArangoDB GmbH, Cologne, Germany
/// Copyright 2004-2014 triAGENS GmbH, Cologne, Germany
///
/// 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.
///
/// Copyright holder is ArangoDB GmbH, Cologne, Germany
///
/// @author Dr. Frank Celler
/// @author Achim Brandt
/// @author Copyright 2014, ArangoDB GmbH, Cologne, Germany
/// @author Copyright 2008-2013, triAGENS GmbH, Cologne, Germany
////////////////////////////////////////////////////////////////////////////////
#ifndef ARANGODB_SCHEDULER_ASYNC_TASK_H
#define ARANGODB_SCHEDULER_ASYNC_TASK_H 1
#include "Basics/Common.h"
#include "Scheduler/Task.h"
namespace triagens {
namespace rest {
////////////////////////////////////////////////////////////////////////////////
/// @brief task used to handle asyncs
////////////////////////////////////////////////////////////////////////////////
class AsyncTask : virtual public Task {
public:
////////////////////////////////////////////////////////////////////////////////
/// @brief constructs a new task
////////////////////////////////////////////////////////////////////////////////
AsyncTask ();
public:
////////////////////////////////////////////////////////////////////////////////
/// @brief signals the task
///
/// Note that this method can only be called after the task has been registered.
////////////////////////////////////////////////////////////////////////////////
void signal ();
protected:
////////////////////////////////////////////////////////////////////////////////
/// @brief destructor
////////////////////////////////////////////////////////////////////////////////
~AsyncTask ();
protected:
////////////////////////////////////////////////////////////////////////////////
/// @brief handles the signal
////////////////////////////////////////////////////////////////////////////////
virtual bool handleAsync () = 0;
protected:
////////////////////////////////////////////////////////////////////////////////
/// {@inheritDoc}
////////////////////////////////////////////////////////////////////////////////
bool setup (Scheduler*, EventLoop) override;
////////////////////////////////////////////////////////////////////////////////
/// {@inheritDoc}
////////////////////////////////////////////////////////////////////////////////
void cleanup () override;
////////////////////////////////////////////////////////////////////////////////
/// {@inheritDoc}
////////////////////////////////////////////////////////////////////////////////
bool handleEvent (EventToken, EventType) override;
protected:
////////////////////////////////////////////////////////////////////////////////
/// @brief event for async signals
////////////////////////////////////////////////////////////////////////////////
EventToken watcher;
};
}
}
#endif
// -----------------------------------------------------------------------------
// --SECTION-- END-OF-FILE
// -----------------------------------------------------------------------------
// Local Variables:
// mode: outline-minor
// outline-regexp: "/// @brief\\|/// {@inheritDoc}\\|/// @page\\|// --SECTION--\\|/// @\\}"
// End: