Mercurial > hg > orthanc

diff OrthancServer/ServerIndex.h @ 3174:8ea7c4546c3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
primitives to collect metrics in Orthanc
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 29 Jan 2019 15:15:48 +0100
parents beeeb6096f27
children 4bbadcd03966
line wrap: on
line diff
--- a/OrthancServer/ServerIndex.h	Tue Jan 29 10:34:00 2019 +0100
+++ b/OrthancServer/ServerIndex.h	Tue Jan 29 15:15:48 2019 +0100
@@ -97,16 +97,6 @@
                         Orthanc::ResourceType type,
                         const std::string& publicId);
 
-    void GetStatisticsInternal(/* out */ uint64_t& diskSize, 
-                               /* out */ uint64_t& uncompressedSize, 
-                               /* out */ unsigned int& countStudies, 
-                               /* out */ unsigned int& countSeries, 
-                               /* out */ unsigned int& countInstances, 
-                               /* out */ uint64_t& dicomDiskSize, 
-                               /* out */ uint64_t& dicomUncompressedSize, 
-                               /* in  */ int64_t id,
-                               /* in  */ ResourceType type);
-
     bool GetMetadataAsInteger(int64_t& result,
                               int64_t id,
                               MetadataType type);
@@ -161,7 +151,12 @@
                       DicomInstanceToStore& instance,
                       const Attachments& attachments);
 
-    void ComputeStatistics(Json::Value& target);                        
+    void GetGlobalStatistics(/* out */ uint64_t& diskSize,
+                             /* out */ uint64_t& uncompressedSize,
+                             /* out */ uint64_t& countPatients, 
+                             /* out */ uint64_t& countStudies, 
+                             /* out */ uint64_t& countSeries, 
+                             /* out */ uint64_t& countInstances);
 
     bool LookupResource(Json::Value& result,
                         const std::string& publicId,
@@ -242,17 +237,15 @@
 
     void DeleteExportedResources();
 
-    void GetStatistics(Json::Value& target,
-                       const std::string& publicId);
-
-    void GetStatistics(/* out */ uint64_t& diskSize, 
-                       /* out */ uint64_t& uncompressedSize, 
-                       /* out */ unsigned int& countStudies, 
-                       /* out */ unsigned int& countSeries, 
-                       /* out */ unsigned int& countInstances, 
-                       /* out */ uint64_t& dicomDiskSize, 
-                       /* out */ uint64_t& dicomUncompressedSize, 
-                       const std::string& publicId);
+    void GetResourceStatistics(/* out */ ResourceType& type,
+                               /* out */ uint64_t& diskSize, 
+                               /* out */ uint64_t& uncompressedSize, 
+                               /* out */ unsigned int& countStudies, 
+                               /* out */ unsigned int& countSeries, 
+                               /* out */ unsigned int& countInstances, 
+                               /* out */ uint64_t& dicomDiskSize, 
+                               /* out */ uint64_t& dicomUncompressedSize, 
+                               const std::string& publicId);
 
     void LookupIdentifierExact(std::vector<std::string>& result,
                                ResourceType level,