MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148534
Change subject: Revert "Derive FastStringSearchResource from ResourceData, not
SweepableResourceData"
......................................................................
Revert "Derive FastStringSearchResource from ResourceData, not
SweepableResourceData"
This reverts commit 2dfac3e284dabbc8d5001ae1bda32c5ddbc07d17.
Change-Id: Icf5e59593478c85be9058fadce8dce76aedfe76e
---
M fss.cpp
1 file changed, 8 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/FastStringSearch
refs/changes/34/148534/1
diff --git a/fss.cpp b/fss.cpp
index 5df729d..8eb257c 100644
--- a/fss.cpp
+++ b/fss.cpp
@@ -16,11 +16,10 @@
Variant* replace[1];
} fss_resource_t;
-class FastStringSearchResource : public ResourceData {
+class FastStringSearchResource : public SweepableResourceData {
public:
- DECLARE_RESOURCE_ALLOCATION_NO_SWEEP(FastStringSearchResource)
+ DECLARE_RESOURCE_ALLOCATION(FastStringSearchResource)
CLASSNAME_IS("fss")
-
virtual const String& o_getClassNameHook() const {
return classnameof();
}
@@ -28,28 +27,28 @@
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;
const char *error;
--
To view, visit https://gerrit.wikimedia.org/r/148534
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf5e59593478c85be9058fadce8dce76aedfe76e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/FastStringSearch
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
