From c34c3b2e6efbd5ea016a7d6a5dbca26dcc5a0b2a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 24 May 2010 22:38:02 +0000 Subject: [PATCH] Support also memcache client for memcached. --- htdocs/lib/memory.lib.php | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/htdocs/lib/memory.lib.php b/htdocs/lib/memory.lib.php index 368dd82d3ee..924486e1aa7 100644 --- a/htdocs/lib/memory.lib.php +++ b/htdocs/lib/memory.lib.php @@ -19,7 +19,7 @@ /** * \file htdocs/lib/memory.lib.php - * \brief Set of function for memory management + * \brief Set of function for memory/cache management * \version $Id$ */ @@ -62,6 +62,21 @@ function dol_setcache($memoryid,$data) return -$rescode; } } + else if (! empty($conf->memcached->enabled) && class_exists('Memcache')) + { + $m=new Memcache(); + $result=$m->addServer($conf->global->MEMCACHED_SERVER, $conf->global->MEMCACHED_PORT); + //$m->setOption(Memcached::OPT_COMPRESSION, false); + $result=$m->add($memoryid,$data); + if ($result) + { + return sizeof($data); + } + else + { + return -1; + } + } // Using shmop else if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) { @@ -99,6 +114,23 @@ function dol_getcache($memoryid) return -$rescode; } } + else if (! empty($conf->memcached->enabled) && class_exists('Memcache')) + { + $m=new Memcache(); + $result=$m->addServer($conf->global->MEMCACHED_SERVER, $conf->global->MEMCACHED_PORT); + //$m->setOption(Memcached::OPT_COMPRESSION, false); + $data=$m->get($memoryid); + //print "memoryid=".$memoryid." - rescode=".$rescode." - date=".sizeof($data)."\n
"; + //var_dump($data); + if ($data) + { + return $data; + } + else + { + return -1; + } + } // Using shmop else if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) {