Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141897
Change subject: Derive FastStringSearchResource from ResourceData, not
SweepableResourceData
......................................................................
Derive FastStringSearchResource from ResourceData, not SweepableResourceData
The fss_resource_t struct is smart-allocated, so it should be left for
ResourceData's default sweep() to handle.
Change-Id: I57d97738d940f5d53a31579a0929d065f06bc2e3
---
M fss.cpp
1 file changed, 9 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/FastStringSearch
refs/changes/97/141897/1
diff --git a/fss.cpp b/fss.cpp
index 8eb257c..5df729d 100644
--- a/fss.cpp
+++ b/fss.cpp
@@ -16,10 +16,11 @@
Variant* replace[1];
} fss_resource_t;
-class FastStringSearchResource : public SweepableResourceData {
+class FastStringSearchResource : public ResourceData {
public:
- DECLARE_RESOURCE_ALLOCATION(FastStringSearchResource)
+ DECLARE_RESOURCE_ALLOCATION_NO_SWEEP(FastStringSearchResource)
CLASSNAME_IS("fss")
+
virtual const String& o_getClassNameHook() const {
return classnameof();
}
@@ -27,27 +28,27 @@
explicit FastStringSearchResource(fss_resource_t* fss_r) {
m_fss_r = fss_r;
}
+
virtual ~FastStringSearchResource() {
close();
}
+
void close() {
int i;
- for (i=0; i < m_fss_r->replace_size; i++ ) {
- if(m_fss_r->replace[i]) {
+ for (i = 0; i < m_fss_r->replace_size; i++) {
+ if (m_fss_r->replace[i]) {
delete(m_fss_r->replace[i]);
}
}
}
+
fss_resource_t* getStruct() {
return m_fss_r;
}
+
private:
fss_resource_t* m_fss_r;
};
-
-void FastStringSearchResource::sweep() {
- close();
-}
static Variant HHVM_FUNCTION(fss_prep_search, const Variant& needle) {
fss_resource_t * res;
--
To view, visit https://gerrit.wikimedia.org/r/141897
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I57d97738d940f5d53a31579a0929d065f06bc2e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/FastStringSearch
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
