kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Need to revert Byte changes, AutoGCRoot is releasing memory too quickly on iOS"

Browse Source 
This reverts commit 3127e4a0b9.
This commit is contained in:
Joshua Granick
2016-09-26 09:04:05 -07:00
parent 3c059cacbc
commit 129108744d
2 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
project/include/utils/Bytes.h
View File

@@ -29,7 +29,8 @@ namespace lime {
unsigned char *_data;
int _length;
value *_root;
value _pin;
AutoGCRoot *_root;
value _value;

48
project/src/utils/Bytes.cpp
View File

@@ -1,3 +1,4 @@
#include <hx/CFFIExt.h>
#include <system/System.h>
#include <utils/Bytes.h>
@@ -39,8 +40,9 @@ namespace lime {
_data = 0;
_length = 0;
_value = 0;
_pin = 0;
_root = 0;
_value = 0;
}
@@ -51,8 +53,9 @@ namespace lime {
_data = 0;
_length = 0;
_value = 0;
_pin = 0;
_root = 0;
_value = 0;
Resize (size);
@@ -65,8 +68,9 @@ namespace lime {
_data = 0;
_length = 0;
_value = 0;
_pin = 0;
_root = 0;
_value = 0;
Set (bytes);
@@ -79,8 +83,9 @@ namespace lime {
_data = 0;
_length = 0;
_value = 0;
_pin = 0;
_root = 0;
_value = 0;
FILE_HANDLE *file = lime::fopen (path, "rb");
@@ -112,8 +117,9 @@ namespace lime {
_data = 0;
_length = 0;
_value = 0;
_pin = 0;
_root = 0;
_value = 0;
Set (data);
@@ -122,10 +128,15 @@ namespace lime {
Bytes::~Bytes () {
if (_pin) {
EXT_unpin_buffer (_pin);
}
if (_root) {
*_root = 0;
free_root (_root);
delete _root;
}
@@ -160,8 +171,7 @@ namespace lime {
if (!_value) {
_value = alloc_empty_object ();
_root = alloc_root ();
*_root = _value;
_root = new AutoGCRoot (_value);
}
@@ -222,8 +232,7 @@ namespace lime {
if (_root) {
*_root = 0;
free_root (_root);
delete _root;
}
@@ -235,11 +244,14 @@ namespace lime {
if (!_root) {
_root = alloc_root ();
_root = new AutoGCRoot (_value);
} else {
_root->set (_value);
}
*_root = _value;
_length = val_int (val_field (bytes, id_length));
if (_length > 0) {
@@ -283,8 +295,7 @@ namespace lime {
if (_root) {
*_root = 0;
free_root (_root);
delete _root;
}
@@ -299,6 +310,13 @@ namespace lime {
if (_value) {
if (!_pin && HAS_pin_buffer ()) {
buffer b = val_to_buffer (val_field (_value, id_b));
_pin = EXT_pin_buffer (b);
}
return _value;
} else {