Skip to content

Commit

Permalink
refactor(NLVObject): use smart pointers for tracking object lifetime
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rush
Rush committed Aug 27, 2016
1 parent 1ee78c1 commit 9794cfe
Show file tree
Hide file tree
Showing 14 changed files with 115 additions and 150 deletions.
76 changes: 38 additions & 38 deletions src/domain.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ NAN_METHOD(Domain::LookupById)
NLV_WORKER_EXECUTE(Domain, LookupById)
{
NLV_WORKER_ASSERT_PARENT_HANDLE();
lookupHandle_ = virDomainLookupByID(parent_->handle_, id_);
lookupHandle_ = virDomainLookupByID(parent_->handle(), id_);
if (lookupHandle_ == NULL) {
SetVirError(virSaveLastError());
return;
Expand All @@ -318,7 +318,7 @@ NLV_WORKER_EXECUTE(Domain, Create)
{
NLV_WORKER_ASSERT_PARENT_HANDLE();
unsigned int flags = 0;
lookupHandle_ = virDomainCreateXML(parent_->handle_, value_.c_str(), flags);
lookupHandle_ = virDomainCreateXML(parent_->handle(), value_.c_str(), flags);
if (lookupHandle_ == NULL) {
SetVirError(virSaveLastError());
return;
Expand All @@ -329,7 +329,7 @@ NLV_WORKER_METHOD_DEFINE(Domain)
NLV_WORKER_EXECUTE(Domain, Define)
{
NLV_WORKER_ASSERT_PARENT_HANDLE();
lookupHandle_ = virDomainDefineXML(parent_->handle_, value_.c_str());
lookupHandle_ = virDomainDefineXML(parent_->handle(), value_.c_str());
if (lookupHandle_ == NULL) {
SetVirError(virSaveLastError());
return;
Expand All @@ -348,7 +348,7 @@ NAN_METHOD(Domain::Save)
std::string path(*Nan::Utf8String(info[0]->ToString()));
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::AsyncQueueWorker(new SaveWorker(callback, domain->handle_, path));
Nan::AsyncQueueWorker(new SaveWorker(callback, domain->handle(), path));
return;
}

Expand Down Expand Up @@ -382,7 +382,7 @@ NAN_METHOD(Domain::Restore)
std::string path(*Nan::Utf8String(info[0]->ToString()));
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(object);
Nan::AsyncQueueWorker(new RestoreWorker(callback, hv->handle_, path));
Nan::AsyncQueueWorker(new RestoreWorker(callback, hv->handle(), path));
return;
}

Expand Down Expand Up @@ -410,7 +410,7 @@ NAN_METHOD(Domain::CoreDump)
std::string path(*Nan::Utf8String(info[0]->ToString()));
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::AsyncQueueWorker(new CoreDumpWorker(callback, domain->handle_, path));
Nan::AsyncQueueWorker(new CoreDumpWorker(callback, domain->handle(), path));
return;
}

Expand Down Expand Up @@ -723,7 +723,7 @@ NAN_METHOD(Domain::SetAutostart)
bool autoStart = info[0]->IsTrue();
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::AsyncQueueWorker(new SetAutostartWorker(callback, domain->handle_, autoStart));
Nan::AsyncQueueWorker(new SetAutostartWorker(callback, domain->handle(), autoStart));
return;
}

Expand Down Expand Up @@ -752,7 +752,7 @@ NAN_METHOD(Domain::SetMaxMemory)
// @todo this unsafe, also needs bounds checking!
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::AsyncQueueWorker(new SetMaxMemoryWorker(callback, domain->handle_, maxMemory));
Nan::AsyncQueueWorker(new SetMaxMemoryWorker(callback, domain->handle(), maxMemory));
return;
}

Expand Down Expand Up @@ -781,7 +781,7 @@ NAN_METHOD(Domain::SetMemory)
// @todo this unsafe, also needs bounds checking!
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::AsyncQueueWorker(new SetMemoryWorker(callback, domain->handle_, memory));
Nan::AsyncQueueWorker(new SetMemoryWorker(callback, domain->handle(), memory));
return;
}

Expand Down Expand Up @@ -813,7 +813,7 @@ NAN_METHOD(Domain::ToXml)
return;
}
Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::AsyncQueueWorker(new ToXmlWorker(callback, domain->handle_, flags));
Nan::AsyncQueueWorker(new ToXmlWorker(callback, domain->handle(), flags));
return;
}

Expand Down Expand Up @@ -858,7 +858,7 @@ NAN_METHOD(Domain::GetMetadata)
return;
}
Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::AsyncQueueWorker(new GetMetadataWorker(callback, domain->handle_, type, namespace_uri, flags));
Nan::AsyncQueueWorker(new GetMetadataWorker(callback, domain->handle(), type, namespace_uri, flags));
return;
#endif
}
Expand Down Expand Up @@ -921,7 +921,7 @@ NAN_METHOD(Domain::SetMetadata)
return;
}
Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::AsyncQueueWorker(new SetMetadataWorker(callback, domain->handle_, type, null_metadata, metadata, namespace_key, namespace_uri, flags));
Nan::AsyncQueueWorker(new SetMetadataWorker(callback, domain->handle(), type, null_metadata, metadata, namespace_key, namespace_uri, flags));
return;
#endif
}
Expand Down Expand Up @@ -1000,7 +1000,7 @@ NAN_METHOD(Domain::GetBlockInfo)
std::string path(*Nan::Utf8String(info[0]->ToString()));
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::AsyncQueueWorker(new GetBlockInfoWorker(callback, domain->handle_, path));
Nan::AsyncQueueWorker(new GetBlockInfoWorker(callback, domain->handle(), path));
return;
}

Expand Down Expand Up @@ -1039,7 +1039,7 @@ NAN_METHOD(Domain::GetBlockStats)
std::string path(*Nan::Utf8String(info[0]->ToString()));
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::AsyncQueueWorker(new GetBlockStatsWorker(callback, domain->handle_, path));
Nan::AsyncQueueWorker(new GetBlockStatsWorker(callback, domain->handle(), path));
return;
}

Expand Down Expand Up @@ -1137,7 +1137,7 @@ NAN_METHOD(Domain::GetInterfaceStats)
std::string interface(*Nan::Utf8String(info[0]->ToString()));
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::AsyncQueueWorker(new GetInterfaceStatsWorker(callback, domain->handle_, interface));
Nan::AsyncQueueWorker(new GetInterfaceStatsWorker(callback, domain->handle(), interface));
return;
}

Expand Down Expand Up @@ -1313,7 +1313,7 @@ NAN_METHOD(Domain::AttachDevice)
}

Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::AsyncQueueWorker(new AttachDeviceWorker(callback, domain->handle_, xml, flags));
Nan::AsyncQueueWorker(new AttachDeviceWorker(callback, domain->handle(), xml, flags));
return;
}

Expand Down Expand Up @@ -1359,7 +1359,7 @@ NAN_METHOD(Domain::DetachDevice)
}

Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::AsyncQueueWorker(new DetachDeviceWorker(callback, domain->handle_, xml, flags));
Nan::AsyncQueueWorker(new DetachDeviceWorker(callback, domain->handle(), xml, flags));
return;
}

Expand Down Expand Up @@ -1405,7 +1405,7 @@ NAN_METHOD(Domain::UpdateDevice)
}

Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::AsyncQueueWorker(new UpdateDeviceWorker(callback, domain->handle_, xml, flags));
Nan::AsyncQueueWorker(new UpdateDeviceWorker(callback, domain->handle(), xml, flags));
return;
}

Expand Down Expand Up @@ -1500,7 +1500,7 @@ NAN_METHOD(Domain::SetVcpus)
unsigned int count = info[0]->Int32Value();
Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
Nan::AsyncQueueWorker(new SetVcpusWorker(callback, domain->handle_, count));
Nan::AsyncQueueWorker(new SetVcpusWorker(callback, domain->handle(), count));
return;
}

Expand Down Expand Up @@ -1534,7 +1534,7 @@ NAN_METHOD(Domain::BlockCommit)
unsigned long bandwidth = info[3]->Int32Value();
unsigned int flags = GetFlags(info[4]);

virDomainPtr domain = Nan::ObjectWrap::Unwrap<Domain>(info.This())->handle_;
virDomainPtr domain = Nan::ObjectWrap::Unwrap<Domain>(info.This())->handle();
Worker::RunAsync(info, [=] (Worker::SetOnFinishedHandler onFinished) {
if (virDomainBlockCommit(domain, path.c_str(), base.c_str(), top.c_str(), bandwidth, flags) < 0) {
return virSaveLastError();
Expand All @@ -1558,7 +1558,7 @@ NAN_METHOD(Domain::BlockJobInfo)
std::string path(*Nan::Utf8String(info[0]->ToString()));
unsigned int flags = GetFlags(info[1]);

virDomainPtr domain = Nan::ObjectWrap::Unwrap<Domain>(info.This())->handle_;
virDomainPtr domain = Nan::ObjectWrap::Unwrap<Domain>(info.This())->handle();
Worker::RunAsync(info, [=] (Worker::SetOnFinishedHandler onFinished) {
virDomainBlockJobInfo info;
int ret = virDomainGetBlockJobInfo(domain, path.c_str(), &info, flags);
Expand Down Expand Up @@ -1596,7 +1596,7 @@ NAN_METHOD(Domain::BlockJobAbort)
std::string path(*Nan::Utf8String(info[0]->ToString()));
unsigned int flags = GetFlags(info[1]);

virDomainPtr domain = Nan::ObjectWrap::Unwrap<Domain>(info.This())->handle_;
virDomainPtr domain = Nan::ObjectWrap::Unwrap<Domain>(info.This())->handle();

Worker::RunAsync(info, [=] (Worker::SetOnFinishedHandler onFinished) {
//abort_flags |= VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT;
Expand Down Expand Up @@ -1626,7 +1626,7 @@ NAN_METHOD(Domain::SendKeys)

Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
Nan::AsyncQueueWorker(new SendKeysWorker(callback, domain->handle_, keys));
Nan::AsyncQueueWorker(new SendKeysWorker(callback, domain->handle(), keys));
return;
}

Expand Down Expand Up @@ -1689,9 +1689,9 @@ NAN_METHOD(Domain::Migrate)
}

Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(hyp_obj);
worker = new MigrateWorker(callback, domain->handle_, hypervisor->handle_);
worker = new MigrateWorker(callback, domain->handle(), hypervisor->handle());
} else {
worker = new MigrateWorker(callback, domain->handle_, dest_uri);
worker = new MigrateWorker(callback, domain->handle(), dest_uri);
}

worker->setBandwidth(bandwidth);
Expand Down Expand Up @@ -1761,7 +1761,7 @@ NAN_METHOD(Domain::PinVcpu) {

Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::Callback *callback = new Nan::Callback(info[2].As<Function>());
Nan::AsyncQueueWorker(new PinVcpuWorker(callback, domain->handle_, info[0]->Int32Value(), usables, vcpus));
Nan::AsyncQueueWorker(new PinVcpuWorker(callback, domain->handle(), info[0]->Int32Value(), usables, vcpus));
return;
}

Expand Down Expand Up @@ -1822,7 +1822,7 @@ NAN_METHOD(Domain::MemoryPeek)

Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::Callback *callback = new Nan::Callback(info[3].As<Function>());
Nan::AsyncQueueWorker(new MemoryPeekWorker(callback, domain->handle_, start, size, flags));
Nan::AsyncQueueWorker(new MemoryPeekWorker(callback, domain->handle(), start, size, flags));
return;
}

Expand Down Expand Up @@ -1864,7 +1864,7 @@ NAN_METHOD(Domain::BlockPeek)

Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::Callback *callback = new Nan::Callback(info[4].As<Function>());
Nan::AsyncQueueWorker(new BlockPeekWorker(callback, domain->handle_, path, start, size, flags));
Nan::AsyncQueueWorker(new BlockPeekWorker(callback, domain->handle(), path, start, size, flags));
return;
}

Expand Down Expand Up @@ -1908,7 +1908,7 @@ NAN_METHOD(Domain::RevertToSnapshot) {

Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
Nan::AsyncQueueWorker(new RevertToSnapshotWorker(callback, domain->handle_, *Nan::Utf8String(info[0]->ToString())));
Nan::AsyncQueueWorker(new RevertToSnapshotWorker(callback, domain->handle(), *Nan::Utf8String(info[0]->ToString())));
return;
}

Expand Down Expand Up @@ -1951,7 +1951,7 @@ NAN_METHOD(Domain::TakeSnapshot) {

Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::Callback *callback = new Nan::Callback(info[2].As<Function>());
Nan::AsyncQueueWorker(new TakeSnapshotWorker(callback, domain->handle_, *Nan::Utf8String(info[0]->ToString()), flags));
Nan::AsyncQueueWorker(new TakeSnapshotWorker(callback, domain->handle(), *Nan::Utf8String(info[0]->ToString()), flags));
return;
}

Expand Down Expand Up @@ -1979,7 +1979,7 @@ NAN_METHOD(Domain::DeleteSnapshot) {
std::string name = *Nan::Utf8String(info[0]->ToString());
unsigned int flags = GetFlags(info[1]);

auto domain = Nan::ObjectWrap::Unwrap<Domain>(info.This())->handle_;
auto domain = Nan::ObjectWrap::Unwrap<Domain>(info.This())->handle();
//Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
Worker::RunAsync(info, [=](Worker::SetOnFinishedHandler onFinished) {
auto snapshot = virDomainSnapshotLookupByName(domain, name.c_str(), 0);
Expand Down Expand Up @@ -2008,7 +2008,7 @@ NAN_METHOD(Domain::LookupSnapshotByName) {

Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
Nan::AsyncQueueWorker(new LookupSnapshotByNameWorker(callback, domain->handle_, *Nan::Utf8String(info[0]->ToString())));
Nan::AsyncQueueWorker(new LookupSnapshotByNameWorker(callback, domain->handle(), *Nan::Utf8String(info[0]->ToString())));
return;
}

Expand Down Expand Up @@ -2071,7 +2071,7 @@ NAN_METHOD(Domain::SetMigrationMaxDowntime) {

Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
Nan::AsyncQueueWorker(new SetMigrationMaxDowntimeWorker(callback, domain->handle_, info[0]->Int32Value(), flags));
Nan::AsyncQueueWorker(new SetMigrationMaxDowntimeWorker(callback, domain->handle(), info[0]->Int32Value(), flags));
return;
}

Expand Down Expand Up @@ -2146,7 +2146,7 @@ NAN_METHOD(Domain::RegisterEvent)
Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
int eventId = arg_obj->Get(Nan::New("evtype").ToLocalChecked())->Int32Value();
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
Nan::AsyncQueueWorker(new RegisterEventWorker(callback, domain->handle_, domain, eventId));
Nan::AsyncQueueWorker(new RegisterEventWorker(callback, domain->handle(), domain, eventId));
return;
}

Expand Down Expand Up @@ -2207,7 +2207,7 @@ NAN_METHOD(Domain::UnregisterEvent)

Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
Nan::AsyncQueueWorker(new UnregisterEventWorker(callback, domain->handle_, info[0]->Int32Value()));
Nan::AsyncQueueWorker(new UnregisterEventWorker(callback, domain->handle(), info[0]->Int32Value()));
return;
}

Expand Down Expand Up @@ -2242,7 +2242,7 @@ NAN_METHOD(Domain::SetSchedulerParameters)
Local<Object> newparams = info[0]->ToObject();
Domain *domain = Nan::ObjectWrap::Unwrap<Domain>(info.This());

type = virDomainGetSchedulerType(domain->handle_, &nparams);
type = virDomainGetSchedulerType(domain->handle(), &nparams);
if (type == NULL) {
ThrowLastVirError();
return info.GetReturnValue().Set(Nan::False());
Expand All @@ -2257,7 +2257,7 @@ NAN_METHOD(Domain::SetSchedulerParameters)

memset(params, 0, sizeof(*params) * nparams);

ret = virDomainGetSchedulerParameters(domain->handle_, params, &nparams);
ret = virDomainGetSchedulerParameters(domain->handle(), params, &nparams);
if(ret == -1) {
ThrowLastVirError();
free(params);
Expand Down Expand Up @@ -2294,7 +2294,7 @@ NAN_METHOD(Domain::SetSchedulerParameters)
}
}

ret = virDomainSetSchedulerParameters(domain->handle_, params, nparams);
ret = virDomainSetSchedulerParameters(domain->handle(), params, nparams);
if (ret == -1) {
ThrowLastVirError();
free(params);
Expand Down
Loading

0 comments on commit 9794cfe

Please sign in to comment.