hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Force free memory

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-10-20 10:06:04 +02:00
parent 2f569d7133
commit f695f4ec37
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -36,7 +36,7 @@
"jms/serializer" : "~0.10", "jms/serializer" : "~0.10",
"justinrainbow/json-schema" : "~1.3", "justinrainbow/json-schema" : "~1.3",
"mediavorus/mediavorus" : "~0.4.0", "mediavorus/mediavorus" : "~0.4.0",
"media-alchemyst/media-alchemyst" : "~0.4.0", "media-alchemyst/media-alchemyst" : "dev-master",
"monolog/monolog" : "~1.3", "monolog/monolog" : "~1.3",
"mrclay/minify" : "~2.1.6", "mrclay/minify" : "~2.1.6",
"neutron/silex-imagine-provider" : "~0.1.0", "neutron/silex-imagine-provider" : "~0.1.0",

15
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "2297d6dbf5453ec8d9d55a5f533decf0", "hash": "21f40dfe13f0a9507d9c36b25c54d4f1",
"packages": [ "packages": [
{ {
"name": "alchemy-fr/tcpdf-clone", "name": "alchemy-fr/tcpdf-clone",
@@ -1297,7 +1297,7 @@
"support": { "support": {
"source": "https://github.com/nlegoff/Imagine/tree/flatten-layer" "source": "https://github.com/nlegoff/Imagine/tree/flatten-layer"
}, },
"time": "2014-07-07 17:04:15" "time": "2014-10-08 16:23:33"
}, },
{ {
"name": "jms/metadata", "name": "jms/metadata",
@@ -1524,16 +1524,16 @@
}, },
{ {
"name": "media-alchemyst/media-alchemyst", "name": "media-alchemyst/media-alchemyst",
"version": "0.4.6", "version": "dev-master",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/alchemy-fr/Media-Alchemyst.git", "url": "https://github.com/alchemy-fr/Media-Alchemyst.git",
"reference": "0145a40c01b67268a29ee3863e1ce7be4ad60ac8" "reference": "62fec183416ce6dfdf22e832f0de3c7442a23598"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/0145a40c01b67268a29ee3863e1ce7be4ad60ac8", "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/62fec183416ce6dfdf22e832f0de3c7442a23598",
"reference": "0145a40c01b67268a29ee3863e1ce7be4ad60ac8", "reference": "62fec183416ce6dfdf22e832f0de3c7442a23598",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1593,7 +1593,7 @@
"video", "video",
"video processing" "video processing"
], ],
"time": "2014-09-10 09:44:33" "time": "2014-10-20 07:22:23"
}, },
{ {
"name": "mediavorus/mediavorus", "name": "mediavorus/mediavorus",
@@ -4109,6 +4109,7 @@
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": {
"imagine/imagine": 20, "imagine/imagine": 20,
"media-alchemyst/media-alchemyst": 20,
"phpexiftool/phpexiftool": 20, "phpexiftool/phpexiftool": 20,
"doctrine/data-fixtures": 20 "doctrine/data-fixtures": 20
}, },

3
lib/classes/task/abstract.php
View File

@@ -705,6 +705,9 @@ abstract class task_abstract
$rowsdone ++; $rowsdone ++;
// force free memory
gc_collect_cycles();
$current_memory = memory_get_usage(); $current_memory = memory_get_usage();
if ($current_memory >> 20 >= $this->maxmegs) { if ($current_memory >> 20 >= $this->maxmegs) {
$this->log(sprintf("Max memory (%s M) reached (actual is %.02f M)", $this->maxmegs, ($current_memory >> 10) / 1024), self::LOG_DEBUG); $this->log(sprintf("Max memory (%s M) reached (actual is %.02f M)", $this->maxmegs, ($current_memory >> 10) / 1024), self::LOG_DEBUG);