X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=c69f317e563fb6967cc4078ccae776e9b2c470ae;hb=e30e614e7f63b52306d85040068e2205a9e6327a;hp=a23739c220095564c572108bf124f824f2801138;hpb=38af2f6a998968a49176216d2ec283f9f7bc69a0;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index a23739c2..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/17 21:41:48 $ - Version: $Revision: 1.107 $ + 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 @@ -49,11 +55,6 @@ #include #endif -// How do I do that in CMake ? -#ifdef __APPLE__ - #define HAVE_SA_LEN -#endif //APPLE - #ifdef CMAKE_HAVE_SYS_IOCTL_H #include // For SIOCGIFCONF on Linux #endif @@ -73,14 +74,22 @@ #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 { /** - * \ingroup Globals * \brief Provide a better 'c++' approach for sprintf * For example c code is: * sprintf(trash, "%04x|%04x", group , elem); @@ -110,7 +119,6 @@ std::string Util::Format(const char *format, ...) /** - * \ingroup Globals * \brief Because not available in C++ (?) */ void Util::Tokenize (const std::string &str, @@ -128,7 +136,6 @@ void Util::Tokenize (const std::string &str, } /** - * \ingroup Globals * \brief Because not available in C++ (?) * Counts the number of occurences of a substring within a string */ @@ -154,7 +161,6 @@ int Util::CountSubstring (const std::string &str, } /** - * \ingroup Globals * \brief Weed out a string from the non-printable characters (in order * to avoid corrupting the terminal of invocation when printing) * @param s string to remove non printable characters from @@ -186,7 +192,6 @@ std::string Util::CreateCleanString(std::string const &s) } /** - * \ingroup Globals * \brief Add a SEPARATOR to the end of the name is necessary * @param pathname file/directory name to normalize */ @@ -206,7 +211,6 @@ std::string Util::NormalizePath(std::string const &pathname) } /** - * \ingroup Globals * \brief Get the (directory) path from a full path file name * @param fullName file/directory name to extract Path from */ @@ -228,7 +232,6 @@ std::string Util::GetPath(std::string const &fullName) } /** - * \ingroup Util * \brief Get the (last) name of a full path file name * @param fullName file/directory name to extract end name from */ @@ -250,7 +253,6 @@ std::string Util::GetName(std::string const &fullName) } /** - * \ingroup Util * \brief Get the current date of the system in a dicom string */ std::string Util::GetCurrentDate() @@ -263,7 +265,6 @@ std::string Util::GetCurrentDate() } /** - * \ingroup Util * \brief Get the current time of the system in a dicom string */ std::string Util::GetCurrentTime() @@ -275,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) @@ -291,7 +327,6 @@ std::string Util::DicomString(const char *s, size_t l) } /** - * \ingroup Util * \brief Create a /DICOM/ string: * It should a of even lenght (no odd length ever) * It can contain as many (if you are reading this from your @@ -315,7 +350,6 @@ std::string Util::DicomString(const char *s) } /** - * \ingroup Util * \brief Safely compare two Dicom String: * - Both string should be of even lenght * - We allow padding of even lenght string by either a null @@ -336,7 +370,6 @@ bool Util::DicomStringEqual(const std::string &s1, const char *s2) /** - * \ingroup Util * \brief tells us if the processor we are working with is BigEndian or not */ bool Util::IsCurrentProcessorBigEndian() @@ -513,13 +546,10 @@ int GetMacAddrSys ( unsigned char *addr ) #ifdef __sun //The POSIX version is broken anyway on Solaris, plus would require full //root power - int i; struct arpreq parpreq; - struct sockaddr_in sa, *psa; - struct in_addr inaddr; + struct sockaddr_in *psa; struct hostent *phost; char hostname[MAXHOSTNAMELEN]; - unsigned char *ptr; char **paddrs; int sock, status=0; @@ -561,7 +591,7 @@ int GetMacAddrSys ( unsigned char *addr ) char buf[1024]; int n, i; unsigned char *a; -#if defined(AF_LINK) && !(defined(SIOCGIFHWADDR) || !defined(SIOCGENADDR)) +#if defined(AF_LINK) && (!defined(SIOCGIFHWADDR) && !defined(SIOCGENADDR)) struct sockaddr_dl *sdlp; #endif @@ -644,6 +674,9 @@ int GetMacAddrSys ( unsigned char *addr ) #endif //__sun } +/** + * \brief Gets the M.A.C. adress of the machine writting the DICOM image + */ std::string Util::GetMACAddress() { // This code is the result of a long internet search to find something @@ -651,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 { @@ -673,7 +702,6 @@ std::string Util::GetMACAddress() } /** - * \ingroup Util * \brief Return the IP adress of the machine writting the DICOM image */ std::string Util::GetIPAddress() @@ -687,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); @@ -723,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 @@ -735,38 +763,89 @@ std::string Util::GetIPAddress() } /** - * \ingroup Util * \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; } +/** + * \brief + * @param os ostream to write to + * @param val val + */ template std::ostream &binary_write(std::ostream &os, const T &val) { return os.write(reinterpret_cast(&val), sizeof val); } +/** + * \brief binary_write binary_write + * @param os ostream to write to + * @param val val + */ std::ostream &binary_write(std::ostream &os, const uint16_t &val) { #ifdef GDCM_WORDS_BIGENDIAN @@ -778,6 +857,11 @@ std::ostream &binary_write(std::ostream &os, const uint16_t &val) #endif //GDCM_WORDS_BIGENDIAN } +/** + * \brief binary_write binary_write + * @param os ostream to write to + * @param val val + */ std::ostream &binary_write(std::ostream &os, const uint32_t &val) { #ifdef GDCM_WORDS_BIGENDIAN @@ -790,11 +874,21 @@ std::ostream &binary_write(std::ostream &os, const uint32_t &val) #endif //GDCM_WORDS_BIGENDIAN } +/** + * \brief binary_write binary_write + * @param os ostream to write to + * @param val val + */ std::ostream &binary_write(std::ostream &os, const char *val) { return os.write(val, strlen(val)); } +/** + * \brief + * @param os ostream to write to + * @param val val + */ std::ostream &binary_write(std::ostream &os, std::string const &val) { return os.write(val.c_str(), val.size());