Skip to content

Commit 7039cbb

Browse files
mbroadstmbroadst
committed
refactor(NLVObject): use defined Unwrap for NLVObject subclasses
1 parent 3cc86d2 commit 7039cbb

File tree

8 files changed

+75
-72
lines changed

8 files changed

+75
-72
lines changed

‎src/domain.cc‎

Lines changed: 49 additions & 47 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
@@ -280,7 +280,7 @@ NAN_METHOD(Hypervisor::Disconnect)
280280
}
281281

282282
Nan::Callback *callback = new Nan::Callback(info[0].As<Function>());
283-
Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
283+
Hypervisor *hv = Hypervisor::Unwrap(info.This());
284284
Nan::AsyncQueueWorker(new DisconnectWorker(callback, hv));
285285
return;
286286
}
@@ -436,7 +436,7 @@ NAN_METHOD(Hypervisor::GetMaxVcpus)
436436

437437
std::string type(*Nan::Utf8String(info[0]));
438438
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
439-
Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
439+
Hypervisor *hypervisor = Hypervisor::Unwrap(info.This());
440440
Nan::AsyncQueueWorker(new GetMaxVcpusWorker(callback, hypervisor->virHandle(), type));
441441
return;
442442
}
@@ -481,7 +481,7 @@ NAN_METHOD(Hypervisor::SetKeepAlive)
481481
int interval = info[0]->IntegerValue();
482482
unsigned int count = info[1]->IntegerValue();
483483
Nan::Callback *callback = new Nan::Callback(info[2].As<Function>());
484-
Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
484+
Hypervisor *hypervisor = Hypervisor::Unwrap(info.This());
485485
Nan::AsyncQueueWorker(new SetKeepAliveWorker(callback, hypervisor->virHandle(), interval, count));
486486
return;
487487
}
@@ -520,7 +520,7 @@ NAN_METHOD(Hypervisor::GetBaselineCPU)
520520
}
521521

522522
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
523-
Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
523+
Hypervisor *hypervisor = Hypervisor::Unwrap(info.This());
524524
Nan::AsyncQueueWorker(new GetBaselineCPUWorker(callback, hypervisor->virHandle(), cpus, count, flags));
525525
return;
526526
}
@@ -556,7 +556,7 @@ NAN_METHOD(Hypervisor::CompareCPU)
556556
int flags = 0;
557557
std::string cpu(*Nan::Utf8String(info[0]->ToString()));
558558
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
559-
Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
559+
Hypervisor *hypervisor = Hypervisor::Unwrap(info.This());
560560
Nan::AsyncQueueWorker(new CompareCPUWorker(callback, hypervisor->virHandle(), cpu, flags));
561561
return;
562562
}
@@ -713,7 +713,7 @@ NAN_METHOD(Hypervisor::ListNodeDevices)
713713
callback = new Nan::Callback(info[0].As<Function>());
714714
}
715715

716-
Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
716+
Hypervisor *hypervisor = Hypervisor::Unwrap(info.This());
717717
Nan::AsyncQueueWorker(new ListNodeDevicesWorker(callback, hypervisor->virHandle(), capability));
718718
return;
719719
}
@@ -830,7 +830,7 @@ NAN_METHOD(Hypervisor::GetNodeMemoryStats)
830830
return;
831831
}
832832
Nan::Callback *callback = new Nan::Callback(info[2].As<Function>());
833-
Hypervisor *hypervisor = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
833+
Hypervisor *hypervisor = Hypervisor::Unwrap(info.This());
834834
int numCells = info[0]->IntegerValue();
835835
int flags = info[1]->IntegerValue();
836836
Nan::AsyncQueueWorker(new GetNodeMemoryStatsWorker(callback, hypervisor->virHandle(), numCells, flags));
@@ -880,7 +880,7 @@ NAN_METHOD(Hypervisor::GetNodeCellsFreeMemory)
880880
}
881881

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

‎src/interface.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ NAN_METHOD(Interface::LookupByName)
102102
return;
103103
}
104104

105-
Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(object);
105+
Hypervisor *hv = Hypervisor::Unwrap(object);
106106
std::string name(*Nan::Utf8String(info[0]->ToString()));
107107
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
108108
NLV::AsyncQueueWorker(new LookupByNameWorker(callback, hv, name), info.This());
@@ -125,7 +125,7 @@ NAN_METHOD(Interface::LookupByMacAddress)
125125
return;
126126
}
127127

128-
Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(object);
128+
Hypervisor *hv = Hypervisor::Unwrap(object);
129129
std::string uuid(*Nan::Utf8String(info[0]->ToString()));
130130
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
131131
NLV::AsyncQueueWorker(new LookupByMacAddressWorker(callback, hv, uuid), info.This());

‎src/nlv_object.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ class NLVObject : public NLVObjectBase
113113
Nan::ThrowTypeError(error);
114114
return nullptr;
115115
}
116+
116117
return Unwrap(val->ToObject());
117118
}
118119

‎src/node_device.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ NAN_METHOD(NodeDevice::LookupByName)
4747
return;
4848
}
4949

50-
Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
50+
Hypervisor *hv = Hypervisor::Unwrap(info.This());
5151
std::string name(*Nan::Utf8String(info[0]->ToString()));
5252
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
5353
Nan::AsyncQueueWorker(new LookupByNameWorker(callback, hv, name));
@@ -68,7 +68,7 @@ NAN_METHOD(NodeDevice::Create)
6868
return;
6969
}
7070

71-
Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
71+
Hypervisor *hv = Hypervisor::Unwrap(info.This());
7272
std::string xmlData(*Nan::Utf8String(info[0]->ToString()));
7373
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
7474
Nan::AsyncQueueWorker(new CreateWorker(callback, hv, xmlData));

‎src/secret.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ NAN_METHOD(Secret::LookupByUsage)
8282
return;
8383
}
8484

85-
Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
85+
Hypervisor *hv = Hypervisor::Unwrap(info.This());
8686
int usageType = info[0]->Int32Value();
8787
std::string usageId(*Nan::Utf8String(info[1]->ToString()));
8888
Nan::Callback *callback = new Nan::Callback(info[2].As<Function>());
@@ -115,7 +115,7 @@ NAN_METHOD(Secret::LookupByUUID)
115115
return;
116116
}
117117

118-
Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This());
118+
Hypervisor *hv = Hypervisor::Unwrap(info.This());
119119
std::string uuid(*Nan::Utf8String(info[0]->ToString()));
120120
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
121121
Nan::AsyncQueueWorker(new LookupByUUIDWorker(callback, hv, uuid));
@@ -193,7 +193,7 @@ NAN_METHOD(Secret::SetValue)
193193

194194
std::string value(*Nan::Utf8String(info[0]->ToString()));
195195
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
196-
Secret *secret = Nan::ObjectWrap::Unwrap<Secret>(info.This());
196+
Secret *secret = Secret::Unwrap(info.This());
197197
Nan::AsyncQueueWorker(new SetValueWorker(callback, secret->virHandle(), value));
198198
return;
199199
}

‎src/storage_volume.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ NAN_METHOD(StorageVolume::GetInfo)
9797
}
9898

9999
Nan::Callback *callback = new Nan::Callback(info[0].As<Function>());
100-
StorageVolume *storageVolume = Nan::ObjectWrap::Unwrap<StorageVolume>(info.This());
100+
StorageVolume *storageVolume = StorageVolume::Unwrap(info.This());
101101
Nan::AsyncQueueWorker(new GetInfoWorker(callback, storageVolume->virHandle()));
102102
return;
103103
}
@@ -194,7 +194,7 @@ NAN_METHOD(StorageVolume::LookupByName)
194194
return;
195195
}
196196

197-
StoragePool *sp = Nan::ObjectWrap::Unwrap<StoragePool>(object);
197+
StoragePool *sp = StoragePool::Unwrap(object);
198198
std::string name(*Nan::Utf8String(info[0]->ToString()));
199199
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
200200
NLV::AsyncQueueWorker(new LookupByNameWorker(callback, sp, name), info.This());
@@ -217,7 +217,7 @@ NAN_METHOD(StorageVolume::LookupByKey)
217217
return;
218218
}
219219

220-
Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(object);
220+
Hypervisor *hv = Hypervisor::Unwrap(object);
221221
std::string key(*Nan::Utf8String(info[0]->ToString()));
222222
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
223223
NLV::AsyncQueueWorker(new LookupByKeyWorker(callback, hv, key), info.This());
@@ -240,7 +240,7 @@ NAN_METHOD(StorageVolume::LookupByPath)
240240
return;
241241
}
242242

243-
Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(object);
243+
Hypervisor *hv = Hypervisor::Unwrap(object);
244244
std::string path(*Nan::Utf8String(info[0]->ToString()));
245245
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
246246
NLV::AsyncQueueWorker(new LookupByPathWorker(callback, hv, path), info.This());
@@ -277,8 +277,8 @@ NAN_METHOD(StorageVolume::Clone)
277277
}
278278

279279
std::string xml(*Nan::Utf8String(info[1]->ToString()));
280-
StoragePool *sp = Nan::ObjectWrap::Unwrap<StoragePool>(object);
281-
StorageVolume *sv = Nan::ObjectWrap::Unwrap<StorageVolume>(info[0]->ToObject());
280+
StoragePool *sp = StoragePool::Unwrap(object);
281+
StorageVolume *sv = StorageVolume::Unwrap(info[0]->ToObject());
282282
Nan::Callback *callback = new Nan::Callback(info[2].As<Function>());
283283
NLV::AsyncQueueWorker(new CloneWorker(callback, sp, xml, sv->virHandle()), info.This());
284284
return;

‎src/worker_macros.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
return; \
4848
} \
4949
Nan::Callback *callback = new Nan::Callback(info[0].As<Function>()); \
50-
Class *object = Nan::ObjectWrap::Unwrap<Class>(info.This()); \
50+
Class *object = Class::Unwrap(info.This()); \
5151
Nan::AsyncQueueWorker(new Method##Worker(callback, object->virHandle())); \
5252
return; \
5353
}
@@ -68,7 +68,7 @@
6868
Nan::ThrowTypeError("signature is callback or flags, callback"); \
6969
return; \
7070
} \
71-
Class *object = Nan::ObjectWrap::Unwrap<Class>(info.This()); \
71+
Class *object = Class::Unwrap(info.This()); \
7272
Nan::AsyncQueueWorker(new Method##Worker(callback, object->virHandle(), flags)); \
7373
return; \
7474
}
@@ -85,7 +85,7 @@
8585
Nan::ThrowTypeError("You must specify a Hypervisor instance"); \
8686
return; \
8787
} \
88-
Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This()); \
88+
Hypervisor *hv = Hypervisor::Unwrap(info.This()); \
8989
std::string xmlData(*Nan::Utf8String(info[0]->ToString())); \
9090
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>()); \
9191
NLV::AsyncQueueWorker(new DefineWorker(callback, hv, xmlData), info.This()); \
@@ -104,7 +104,7 @@
104104
Nan::ThrowTypeError("You must specify a Hypervisor instance"); \
105105
return; \
106106
} \
107-
Hypervisor *hv = Nan::ObjectWrap::Unwrap<Hypervisor>(info.This()); \
107+
Hypervisor *hv = Hypervisor::Unwrap(info.This()); \
108108
std::string xmlData(*Nan::Utf8String(info[0]->ToString())); \
109109
Nan::Callback *callback = new Nan::Callback(info[1].As<Function>()); \
110110
NLV::AsyncQueueWorker(new CreateWorker(callback, hv, xmlData), info.This()); \

0 commit comments

Comments
 (0)