X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmUtil.cxx;h=c69f317e563fb6967cc4078ccae776e9b2c470ae;hb=e30e614e7f63b52306d85040068e2205a9e6327a;hp=03cd640eedb86c92ae1022d102b37aa4e91860f3;hpb=83e08556218295a7c84cf631b63389f17322ac7a;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index 03cd640e..c69f317e 100644 --- a/src/gdcmUtil.cxx +++ b/src/gdcmUtil.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmUtil.cxx,v $ Language: C++ - Date: $Date: 2005/01/18 15:46:49 $ - Version: $Revision: 1.111 $ + Date: $Date: 2005/01/21 19:51:12 $ + Version: $Revision: 1.115 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -25,10 +25,16 @@ #include #include +#ifdef _MSC_VER +#include +#else +#include +#endif + #include //only included in implementation file #include //only included in implementation file -#if defined(_MSC_VER) +#if defined(_MSC_VER) || defined(__MINGW32__) #include // for gethostname & gethostbyname #undef GetCurrentTime #else @@ -68,10 +74,19 @@ #include #endif #if defined(CMAKE_HAVE_NET_IF_ARP_H) && defined(__sun) - // This is absolutely necesseray on SunOS + // This is absolutely necessary on SunOS #include #endif +// For GetCurrentThreadID() +#ifdef __linux__ +#include +#include +#endif +#ifdef __sun +#include +#endif + namespace gdcm { /** @@ -261,6 +276,41 @@ std::string Util::GetCurrentTime() return tmp; } +/** + * \brief Get both the date and time at the same time to avoid problem + * around midnight where two call could be before and after midnight + */ +std::string Util::GetCurrentDateTime() +{ + char tmp[40]; + long milliseconds; + time_t *timep; + + // We need implementation specific functions to obtain millisecond precision +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) + struct timeb tb; + ::ftime(&tb); + timep = &tb.time; + milliseconds = tb.millitm; +#else + struct timeval tv; + gettimeofday (&tv, NULL); + timep = &tv.tv_sec; + // Compute milliseconds from microseconds. + milliseconds = tv.tv_usec / 1000; +#endif + // Obtain the time of day, and convert it to a tm struct. + struct tm *ptm = localtime (timep); + // Format the date and time, down to a single second. + strftime (tmp, sizeof (tmp), "%Y%m%d.%H%M%S", ptm); + + // Add milliseconds + std::string r = tmp; + r += Format("%03ld", milliseconds); + + return r; +} + /** * \brief Create a /DICOM/ string: * It should a of even length (no odd length ever) @@ -634,19 +684,15 @@ std::string Util::GetMACAddress() // 3 OS: Win32, SunOS and 'real' POSIX // http://groups-beta.google.com/group/comp.unix.solaris/msg/ad36929d783d63be // http://bdn.borland.com/article/0,1410,26040,00.html - unsigned char addr[6]; - std::string macaddr; + union dual { uint64_t n; unsigned char addr[6]; }; - int stat = GetMacAddrSys(addr); - if (0 == stat) + // zero-initialize the whole thing first: + dual d = { 0 }; + int stat = GetMacAddrSys(d.addr); + if (stat == 0) { - for (int i=0; i<6; ++i) - { - macaddr += Format("%2.2x", addr[i]); - //if(i) macaddr += "."; - //macaddr += Format("%i", (int)addr[i]); - } - return macaddr; + // fill with zero to fit on 15 bytes. + return Format("%015llu", d.n); } else { @@ -669,8 +715,8 @@ std::string Util::GetIPAddress() # define HOST_NAME_MAX 255 // In this case we should maybe check the string was not truncated. // But I don't known how to check that... -#if defined(_MSC_VER) || defined(__BORLANDC__) - // with WinSock DLL we need to initialise the WinSock before using gethostname +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) + // with WinSock DLL we need to initialize the WinSock before using gethostname WORD wVersionRequested = MAKEWORD(1,0); WSADATA WSAData; int err = WSAStartup(wVersionRequested,&WSAData); @@ -705,7 +751,7 @@ std::string Util::GetIPAddress() } // str now contains one local IP address -#if defined(_MSC_VER) || defined(__BORLANDC__) +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) WSACleanup(); #endif @@ -720,26 +766,68 @@ std::string Util::GetIPAddress() * \brief Creates a new UID. As stipulate in the DICOM ref * each time a DICOM image is create it should have * a unique identifier (URI) + * @param root is the DICOM prefix assigned by IOS group + * @param is a string you want to append to the UID. */ std::string Util::CreateUniqueUID(const std::string &root) { - std::string radical = root; - if( !root.size() ) + std::string prefix = root; + std::string append; + if( root.empty() ) { // No root was specified use "GDCM" then // echo "gdcm" | od -b // 0000000 147 144 143 155 012 - radical = "147.144.143.155"; // special easter egg + prefix = "147.144.143.155"; // special easter egg } // else // A root was specified use it to forge our new UID: - radical += Util::GetMACAddress(); - radical += "."; - radical += Util::GetCurrentDate(); - radical += "."; - radical += Util::GetCurrentTime(); + append += "."; + append += Util::GetMACAddress(); + append += "."; + //append += Util::GetCurrentDate(); + //append += "."; + //append += Util::GetCurrentTime(); + append += Util::GetCurrentDateTime(); + + // If append is too long we need to rehash it + if( (prefix + append).size() > 64 ) + { + gdcmErrorMacro( "Size of UID is too long." ); + // we need a hash function to truncate this number + // if only md5 was cross plateform + // MD5(append); + } + + return prefix + append; +} + +unsigned int Util::GetCurrentThreadID() +{ +// FIXME the implementation is far from complete +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) + return (unsigned int)GetCurrentThreadId(); +#endif +#ifdef __linux__ + return 0; + // Doesn't work on fedora, but is in the man page... + //return (unsigned int)gettid(); +#endif +#ifdef __sun + return (unsigned int)thr_self(); +#endif +} + +unsigned int Util::GetCurrentProcessID() +{ +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) + // NOTE: There is also a _getpid()... + return (unsigned int)GetCurrentProcessId(); +#else + // get process identification, POSIX + return (unsigned int)getpid(); +#endif - return radical; } /**