Skip to content

Commit 3cc86d2

Browse files
mbroadstmbroadst
committed
refactor(NLVObject): rename confusing handle to virHandle 
1 parent ab317a7 commit 3cc86d2

File tree

12 files changed

+78
-78
lines changed

12 files changed

+78
-78
lines changed

‎src/domain.cc‎

Lines changed: 45 additions & 45 deletions
Large diffs are not rendered by default.

‎src/hypervisor.cc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ NLV_WORKER_EXECUTE(Hypervisor, Disconnect)
297297
// }
298298

299299
// assert(result == 0);
300-
// hypervisor_->handle() = NULL;
300+
// hypervisor_->virHandle() = NULL;
301301
}
302302

303303
#define HYPERVISOR_STRING_RETURN_EXECUTE(MethodName, Accessor) \
@@ -437,7 +437,7 @@ NAN_METHOD(Hypervisor::GetMaxVcpus)
437437
std::string type(*Nan::Utf8String(info[0]));
438438
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
439439
Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
440-
Nan::AsyncQueueWorker(new GetMaxVcpusWorker(callback, hypervisor->handle(), type));
440+
Nan::AsyncQueueWorker(new GetMaxVcpusWorker(callback, hypervisor->virHandle(), type));
441441
return;
442442
}
443443

@@ -482,7 +482,7 @@ NAN_METHOD(Hypervisor::SetKeepAlive)
482482
unsigned int count = info[1]->IntegerValue();
483483
Nan::Callback *callback = new Nan::Callback(info[2].As<Function>());
484484
Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
485-
Nan::AsyncQueueWorker(new SetKeepAliveWorker(callback, hypervisor->handle(), interval, count));
485+
Nan::AsyncQueueWorker(new SetKeepAliveWorker(callback, hypervisor->virHandle(), interval, count));
486486
return;
487487
}
488488

@@ -521,7 +521,7 @@ NAN_METHOD(Hypervisor::GetBaselineCPU)
521521

522522
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
523523
Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
524-
Nan::AsyncQueueWorker(new GetBaselineCPUWorker(callback, hypervisor->handle(), cpus, count, flags));
524+
Nan::AsyncQueueWorker(new GetBaselineCPUWorker(callback, hypervisor->virHandle(), cpus, count, flags));
525525
return;
526526
}
527527

@@ -557,7 +557,7 @@ NAN_METHOD(Hypervisor::CompareCPU)
557557
std::string cpu(*Nan::Utf8String(info[0]->ToString()));
558558
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
559559
Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
560-
Nan::AsyncQueueWorker(new CompareCPUWorker(callback, hypervisor->handle(), cpu, flags));
560+
Nan::AsyncQueueWorker(new CompareCPUWorker(callback, hypervisor->virHandle(), cpu, flags));
561561
return;
562562
}
563563

@@ -714,7 +714,7 @@ NAN_METHOD(Hypervisor::ListNodeDevices)
714714
}
715715

716716
Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
717-
Nan::AsyncQueueWorker(new ListNodeDevicesWorker(callback, hypervisor->handle(), capability));
717+
Nan::AsyncQueueWorker(new ListNodeDevicesWorker(callback, hypervisor->virHandle(), capability));
718718
return;
719719
}
720720

@@ -833,7 +833,7 @@ NAN_METHOD(Hypervisor::GetNodeMemoryStats)
833833
Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
834834
int numCells = info[0]->IntegerValue();
835835
int flags = info[1]->IntegerValue();
836-
Nan::AsyncQueueWorker(new GetNodeMemoryStatsWorker(callback, hypervisor->handle(), numCells, flags));
836+
Nan::AsyncQueueWorker(new GetNodeMemoryStatsWorker(callback, hypervisor->virHandle(), numCells, flags));
837837
return;
838838
}
839839

@@ -881,7 +881,7 @@ NAN_METHOD(Hypervisor::GetNodeCellsFreeMemory)
881881

882882
Nan::Callback *callback = new Nan::Callback(info[2].As<Function>());
883883
Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
884-
Nan::AsyncQueueWorker(new GetNodeCellsFreeMemoryWorker(callback, hypervisor->handle(), startCell, maxCells));
884+
Nan::AsyncQueueWorker(new GetNodeCellsFreeMemoryWorker(callback, hypervisor->virHandle(), startCell, maxCells));
885885
return;
886886
}
887887

‎src/hypervisor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class Hypervisor : public NLVObject<Hypervisor, virConnectPtr, HypervisorCleanup
9999
class DisconnectWorker : public NLVAsyncWorker<virConnectPtr> {
100100
public:
101101
DisconnectWorker(Nan::Callback *callback, Hypervisor *hypervisor)
102-
: NLVAsyncWorker(callback, hypervisor->handle()), hypervisor_(hypervisor) {}
102+
: NLVAsyncWorker(callback, hypervisor->virHandle()), hypervisor_(hypervisor) {}
103103
void Execute();
104104
private:
105105
Hypervisor *hypervisor_;

‎src/interface.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ NLV_WORKER_METHOD_DEFINE(Interface)
6666
NLV_WORKER_EXECUTE(Interface, Define)
6767
{
6868
unsigned int flags = 0;
69-
lookupHandle_ = virInterfaceDefineXML(parent_->handle(), value_.c_str(), flags);
69+
lookupHandle_ = virInterfaceDefineXML(parent_->virHandle(), value_.c_str(), flags);
7070
if (lookupHandle_ == NULL) {
7171
SetVirError(virSaveLastError());
7272
return;

‎src/network.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ NLV_WORKER_METHOD_CREATE(Network)
8080
NLV_WORKER_EXECUTE(Network, Create)
8181
{
8282
NLV_WORKER_ASSERT_PARENT_HANDLE();
83-
lookupHandle_ = virNetworkCreateXML(parent_->handle(), value_.c_str());
83+
lookupHandle_ = virNetworkCreateXML(parent_->virHandle(), value_.c_str());
8484
if (lookupHandle_ == NULL) {
8585
SetVirError(virSaveLastError());
8686
return;
@@ -91,7 +91,7 @@ NLV_WORKER_METHOD_DEFINE(Network)
9191
NLV_WORKER_EXECUTE(Network, Define)
9292
{
9393
NLV_WORKER_ASSERT_PARENT_HANDLE();
94-
lookupHandle_ = virNetworkDefineXML(parent_->handle(), value_.c_str());
94+
lookupHandle_ = virNetworkDefineXML(parent_->virHandle(), value_.c_str());
9595
if (lookupHandle_ == NULL) {
9696
SetVirError(virSaveLastError());
9797
return;
@@ -166,7 +166,7 @@ NAN_METHOD(Network::SetAutostart)
166166
bool autoStart = info[0]->IsTrue();
167167
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
168168
Network *network = ObjectWrap::Unwrap<Network>(info.This());
169-
Nan::AsyncQueueWorker(new SetAutostartWorker(callback, network->handle(), autoStart));
169+
Nan::AsyncQueueWorker(new SetAutostartWorker(callback, network->virHandle(), autoStart));
170170
return;
171171
}
172172

‎src/network_filter.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ NLV_WORKER_METHOD_DEFINE(NetworkFilter)
7575
NLV_WORKER_EXECUTE(NetworkFilter, Define)
7676
{
7777
NLV_WORKER_ASSERT_PARENT_HANDLE();
78-
lookupHandle_ = virNWFilterDefineXML(parent_->handle(), value_.c_str());
78+
lookupHandle_ = virNWFilterDefineXML(parent_->virHandle(), value_.c_str());
7979
if (lookupHandle_ == NULL) {
8080
SetVirError(virSaveLastError());
8181
return;

‎src/nlv_object.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class NLVObject : public NLVObjectBase
9090
return Nan::New(ParentClass::constructor_template)->HasInstance(val);
9191
}
9292

93-
const HandleType handle() const {
93+
const HandleType virHandle() const {
9494
return handle_.get();
9595
}
9696

@@ -117,12 +117,12 @@ class NLVObject : public NLVObjectBase
117117
}
118118

119119
NAN_INLINE static HandleType UnwrapHandle(v8::Local<v8::Value> val) {
120-
return Unwrap(val)->handle();
120+
return Unwrap(val)->virHandle();
121121
}
122122

123123
template<class T>
124124
NAN_INLINE static HandleType UnwrapHandle(v8::Local<v8::Object> val) {
125-
return Unwrap(val)->handle();
125+
return Unwrap(val)->virHandle();
126126
}
127127

128128
virtual void ClearHandle() {

‎src/node_device.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ NLV_WORKER_EXECUTE(NodeDevice, Create)
7979
{
8080
NLV_WORKER_ASSERT_PARENT_HANDLE();
8181
unsigned int flags = 0;
82-
lookupHandle_ = virNodeDeviceCreateXML(parent_->handle(), value_.c_str(), flags);
82+
lookupHandle_ = virNodeDeviceCreateXML(parent_->virHandle(), value_.c_str(), flags);
8383
if (lookupHandle_ == NULL) {
8484
SetVirError(virSaveLastError());
8585
return;

‎src/secret.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ NLV_WORKER_EXECUTE(Secret, Define)
3333
{
3434
NLV_WORKER_ASSERT_PARENT_HANDLE();
3535
unsigned int flags = 0;
36-
lookupHandle_ = virSecretDefineXML(parent_->handle(), value_.c_str(), flags);
36+
lookupHandle_ = virSecretDefineXML(parent_->virHandle(), value_.c_str(), flags);
3737
if (lookupHandle_ == NULL) {
3838
SetVirError(virSaveLastError());
3939
return;
@@ -93,7 +93,7 @@ NAN_METHOD(Secret::LookupByUsage)
9393
NLV_WORKER_EXECUTE(Secret, LookupByUsage)
9494
{
9595
NLV_WORKER_ASSERT_PARENT_HANDLE();
96-
lookupHandle_ = virSecretLookupByUsage(parent_->handle(), usageType_, value_.c_str());
96+
lookupHandle_ = virSecretLookupByUsage(parent_->virHandle(), usageType_, value_.c_str());
9797
if (lookupHandle_ == NULL) {
9898
SetVirError(virSaveLastError());
9999
return;
@@ -194,7 +194,7 @@ NAN_METHOD(Secret::SetValue)
194194
std::string value(*Nan::Utf8String(info[0]->ToString()));
195195
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
196196
Secret *secret = Nan::ObjectWrap::Unwrap<Secret>(info.This());
197-
Nan::AsyncQueueWorker(new SetValueWorker(callback, secret->handle(), value));
197+
Nan::AsyncQueueWorker(new SetValueWorker(callback, secret->virHandle(), value));
198198
return;
199199
}
200200

‎src/storage_pool.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ NLV_WORKER_EXECUTE(StoragePool, Create)
144144
{
145145
NLV_WORKER_ASSERT_PARENT_HANDLE();
146146
unsigned int flags = 0;
147-
lookupHandle_ = virStoragePoolCreateXML(parent_->handle(), value_.c_str(), flags);
147+
lookupHandle_ = virStoragePoolCreateXML(parent_->virHandle(), value_.c_str(), flags);
148148
if (lookupHandle_ == NULL) {
149149
SetVirError(virSaveLastError());
150150
return;
@@ -156,7 +156,7 @@ NLV_WORKER_EXECUTE(StoragePool, Define)
156156
{
157157
NLV_WORKER_ASSERT_PARENT_HANDLE();
158158
unsigned int flags = 0;
159-
lookupHandle_ = virStoragePoolDefineXML(parent_->handle(), value_.c_str(), flags);
159+
lookupHandle_ = virStoragePoolDefineXML(parent_->virHandle(), value_.c_str(), flags);
160160
if (lookupHandle_ == NULL) {
161161
SetVirError(virSaveLastError());
162162
return;
@@ -235,7 +235,7 @@ NAN_METHOD(StoragePool::Erase)
235235

236236
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
237237
StoragePool *storagePool = ObjectWrap::Unwrap<StoragePool>(info.This());
238-
Nan::AsyncQueueWorker(new EraseWorker(callback, storagePool->handle(), flags));
238+
Nan::AsyncQueueWorker(new EraseWorker(callback, storagePool->virHandle(), flags));
239239
return;
240240
}
241241

@@ -281,7 +281,7 @@ NAN_METHOD(StoragePool::SetAutostart)
281281
bool autoStart = info[0]->IsTrue();
282282
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
283283
StoragePool *storagePool = ObjectWrap::Unwrap<StoragePool>(info.This());
284-
Nan::AsyncQueueWorker(new SetAutostartWorker(callback, storagePool->handle(), autoStart));
284+
Nan::AsyncQueueWorker(new SetAutostartWorker(callback, storagePool->virHandle(), autoStart));
285285
return;
286286
}
287287

@@ -401,7 +401,7 @@ NAN_METHOD(StoragePool::GetVolumes)
401401

402402
Nan::Callback *callback = new Nan::Callback(info[0].As<Function>());
403403
StoragePool *storagePool = ObjectWrap::Unwrap<StoragePool>(info.This());
404-
Nan::AsyncQueueWorker(new GetVolumesWorker(callback, storagePool->handle()));
404+
Nan::AsyncQueueWorker(new GetVolumesWorker(callback, storagePool->virHandle()));
405405
return;
406406
}
407407

0 commit comments

Comments
 (0)