[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] common/filewriter archivr2.cpp,1.22.22.1,1.22.22.2
From:       ryuan () helixcommunity ! org
Date:       2012-09-05 11:01:08
[Download RAW message or body]

Update of /cvsroot/datatype/common/filewriter
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv27735

Modified Files:
      Tag: SERVER_15_0
	archivr2.cpp 
Log Message:
Synopsis:
=========
Fixes Bug 270635 [Live archiving api]: no archive file created for multi-rate live \
feed by stop command if there are several live feeds pushed to hms

Branches: SERVER_15_0, head
Suggested Reviewers: James, Xiaocheng and Anyone

Description:
============
Refer the bug description.

Root
When start archiving multiple files at the same time, since the GUIDs of the archive \
files only depend on machineID and time, they are same, the file confliction occurs. 

Fix:
Use a unique sequence number for each file to make sure no confliction.

Files affected:
===============
datatype/common/filewriter/pub/archivr2.h
datatype/common/filewriter/archivr2.cpp

Testing Performed:
================
Unit Tests:
None.

Integration Tests:
None

Leak Tests: None
Performance Tests: N/A

Platforms Tested: win-x86_64-vc10.
Builds Verified: win-x86_64-vc10.

QA Hints
========
None.



Index: archivr2.cpp
===================================================================
RCS file: /cvsroot/datatype/common/filewriter/archivr2.cpp,v
retrieving revision 1.22.22.1
retrieving revision 1.22.22.2
diff -u -d -r1.22.22.1 -r1.22.22.2
--- archivr2.cpp	3 Sep 2012 06:44:37 -0000	1.22.22.1
+++ archivr2.cpp	5 Sep 2012 11:00:55 -0000	1.22.22.2
@@ -76,6 +76,8 @@
 #include "fullpathname.h"
 #endif
 
+UINT64 CBaseArchiver2::zm_ul64FileSequence = 0;
+
 
 // 
 //  Class: CBaseArchiver2
@@ -1113,11 +1115,11 @@
     // Construct temp output filename and convert it to an URL
     if (m_bUseTempFiles)
     {
-	strTempFilename.Format("%stemp_%s.tmp", (const char*) m_ArchiveDir, (const char*) \
m_pVolumeGUIDName); +        strTempFilename.Format("%stemp%llu_%s.tmp", (const \
char*) m_ArchiveDir, zm_ul64FileSequence++, (const char*) m_pVolumeGUIDName);  }
     else
     {
-	strTempFilename.Format("%s%s%s", (const char*) m_ArchiveDir, (const char*) \
m_FileName, (const char*) m_AddOnExtension); +        \
strTempFilename.Format("%s%s%s", (const char*) m_ArchiveDir, (const char*) \
m_FileName, (const char*) m_AddOnExtension);  }
     
     return hResult;


_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs


[prev in list] [next in list] [prev in thread] [next in thread]