free and unset DB_DataObjects after we're done with them

darcs-hash:20080906015501-84dde-e787962b9805759224389dd42a211dfa21da3473.gz

diff --git a/lib/jabber.php b/lib/jabber.php
index a9643f4a67ea28ee6c4a68d3d1dbb562d93405fd..bd7d6b7074d38acbeb713a124d67178812eebfbc 100644 (file)
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -92,6 +92,7 @@ function jabber_send_notice($to, $notice) {
        $msg = jabber_format_notice($profile, $notice);
        $entry = jabber_format_entry($profile, $notice);
        $conn->message($to, $msg, 'chat', NULL, $entry);
+       $profile->free();
        return true;
 }
 
@@ -204,6 +205,9 @@ function jabber_broadcast_notice($notice) {
        $msg = jabber_format_notice($profile, $notice);
        $entry = jabber_format_entry($profile, $notice);
 
+       $profile->free();
+       unset($profile);
+       
        $sent_to = array();
        $conn = jabber_connect();
 
@@ -225,6 +229,8 @@ function jabber_broadcast_notice($notice) {
                $sent_to[$user->id] = 1;
        }
 
+       $user->free();
+       
     # Now, get users subscribed to this profile
 
        $user = new User();
@@ -245,6 +251,8 @@ function jabber_broadcast_notice($notice) {
                }
        }
 
+       $user->free();
+       
        return true;
 }
 
@@ -280,6 +288,7 @@ function jabber_public_notice($notice) {
                        $conn->message($address, $msg, 'chat', NULL, $entry);
                        $conn->processTime(0);
                }
+               $profile->free();
        }
 
        return true;

diff --git a/lib/omb.php b/lib/omb.php
index b1e8ab1815e6c2aaab547163117825b156f20703..d4f53c33222e77ac32d43d8868201e5ef61c99fc 100644 (file)
--- a/lib/omb.php
+++ b/lib/omb.php
@@ -132,6 +132,9 @@ function omb_broadcast_remote_subscribers($notice) {
                }
        }
 
+       $rp->free();
+       unset($rp);
+       
        return true;
 }
 
@@ -160,6 +163,9 @@ function omb_post_notice_keys($notice, $postnoticeurl, $tk, $secret) {
                                                                                                                                 $notice->id)));
        $req->set_parameter('omb_notice_license', common_config('license', 'url'));
 
+       $user->free();
+       unset($user);
+       
        $req->sign_request(omb_hmac_sha1(), $con, $token);
 
        # We re-use this tool's fetcher, since it's pretty good

diff --git a/lib/queuehandler.php b/lib/queuehandler.php
index d673f7f947b9ec94879573521082c4680beb0887..237df9a7b818f948a4ca1002bd2d88daa72e91a7 100644 (file)
--- a/lib/queuehandler.php
+++ b/lib/queuehandler.php
@@ -87,11 +87,15 @@ class QueueHandler extends Daemon {
                                                continue;
                                        }
                                        $this->log(LOG_INFO, 'finished broadcasting notice ID = ' . $notice->id);
+                                       $notice->free();
+                                       unset($notice);
                                        $notice = NULL;
                                } else {
                                        $this->log(LOG_WARNING, 'queue item for notice that does not exist');
                                }
                                $qi->delete();
+                               $qi->free();
+                               unset($qi);
                                $this->idle(0);
                        } else {
                                $this->clear_old_claims();
@@ -115,6 +119,8 @@ class QueueHandler extends Daemon {
                $qi->transport = $this->transport();
                $qi->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
                $qi->update(DB_DATAOBJECT_WHEREADD_ONLY);
+               $qi->free();
+               unset($qi);
        }
        
        function log($level, $msg) {

diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php
index d3b8ac85a955262fd96eb1263de5151e993e30c2..d1735d8d2e9a1fde29a03d6f0bf85321838e6a7b 100755 (executable)
--- a/scripts/xmppconfirmhandler.php
+++ b/scripts/xmppconfirmhandler.php
@@ -76,6 +76,10 @@ class XmppConfirmHandler extends XmppQueueHandler {
                                                continue;
                                        }
                                }
+                               $user->free();
+                               unset($user);
+                               $confirm->free();
+                               unset($confirm);
                                $this->idle(0);
                        } else {
 #                              $this->clear_old_confirm_claims();
@@ -119,6 +123,8 @@ class XmppConfirmHandler extends XmppQueueHandler {
                $confirm->claimed = NULL;
                $confirm->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
                $confirm->update(DB_DATAOBJECT_WHEREADD_ONLY);
+               $confirm->free();
+               unset($confirm);
        }
 }
 

diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index c5a53e457675c42e0014766fb4f3d182b005fe6f..e067fdcdb232ed30c3eb515ab4fd497aa4445068 100755 (executable)
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -145,6 +145,9 @@ class XMPPDaemon extends Daemon {
                        }
                        $this->add_notice($user, $pl);
                }
+               
+               $user->free();
+               unset($user);
        }
 
        function is_self($from) {
@@ -281,6 +284,8 @@ class XMPPDaemon extends Daemon {
                common_broadcast_notice($notice);
                $this->log(LOG_INFO,
                                   'Added notice ' . $notice->id . ' from user ' . $user->nickname);
+               $notice->free();
+               unset($notice);
        }
 
        function handle_presence(&$pl) {
@@ -310,6 +315,8 @@ class XMPPDaemon extends Daemon {
                                                           ' status from presence.');
                                        $this->add_notice($user, $pl);
                                }
+                               $user->free();
+                               unset($user);
                        }
                        break;
                }