refine the ptr array free, 0.9.96

trunk/src/core/srs_core.hpp

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 #define VERSION_MAJOR "0"
 #define VERSION_MINOR "9"
-#define VERSION_REVISION "95"
+#define VERSION_REVISION "96"
 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
 // server info.
 #define RTMP_SIG_SRS_KEY "srs"

trunk/src/core/srs_core_autofree.hpp

@@ -31,11 +31,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_core.hpp>
 
 /**
-* auto free the instance in the current scope.
+* auto free the instance in the current scope, for instance, MyClass* ptr,
+* which is a ptr and this class will:
+*       1. free the ptr.
+*       2. set ptr to NULL.
+* Usage:
+*       MyClass* po = new MyClass();
+*       // ...... use po
+*       SrsAutoFree(MyClass, po);
 */
 #define SrsAutoFree(className, instance) \
-    __SrsAutoFree<className> _auto_free_##instance((className**)&instance)
-    
+    __SrsAutoFree<className> _auto_free_##instance(&instance)
 template<class T>
 class __SrsAutoFree
 {
@@ -44,13 +50,12 @@ private:
 public:
     /**
     * auto delete the ptr.
-    * @is_array a bool value indicates whether the ptr is a array.
     */
-    __SrsAutoFree(T** _ptr){
+    __SrsAutoFree(T** _ptr) {
         ptr = _ptr;
     }
     
-    virtual ~__SrsAutoFree(){
+    virtual ~__SrsAutoFree() {
         if (ptr == NULL || *ptr == NULL) {
             return;
         }
@@ -64,13 +69,50 @@ public:
 /**
 * auto free the array ptrs, for example, MyClass* msgs[10],
 * which stores 10 MyClass* objects, this class will:
-* 1. free each MyClass* in array.
-* 2. free the msgs itself.
+*       1. free each MyClass* in array.
+*       2. free the msgs itself.
+*       3. set msgs to NULL.
 * @remark, MyClass* msgs[] equals to MyClass**, the ptr array equals ptr to ptr.
+* Usage:
+*       MyClass* msgs[10];
+*       // ...... use msgs.
+*       SrsAutoFreeArray(MyClass, msgs, 10);
 */
+#define SrsAutoFreeArray(className, instance, size) \
+    __SrsAutoFreeArray<className> _auto_free_array_##instance(&instance, size)
 template<class T>
-class SrsObjectPtrArrayAutoFree
+class __SrsAutoFreeArray
 {
+private:
+    T*** ptr;
+    int size;
+public:
+    /**
+    * auto delete the ptr array.
+    */
+    __SrsAutoFreeArray(T*** _ptr, int _size) {
+        ptr = _ptr;
+        size = _size;
+    }
+    
+    virtual ~__SrsAutoFreeArray() {
+        if (ptr == NULL || *ptr == NULL) {
+            return;
+        }
+        
+        T** arr = *ptr;
+        for (int i = 0; i < size; i++) {
+            T* pobj = arr[i];
+            if (pobj) {
+                delete pobj;
+                arr[i] = NULL;
+            }
+        }
+        
+        delete arr;
+        
+        *ptr = NULL;
+    }
 };
 
 #endif