1.1 --- a/src/share/vm/services/nmtDCmd.hpp Wed Aug 27 09:36:55 2014 +0200
1.2 +++ b/src/share/vm/services/nmtDCmd.hpp Wed Aug 27 08:19:12 2014 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -25,8 +25,12 @@
1.11 #ifndef SHARE_VM_SERVICES_NMT_DCMD_HPP
1.12 #define SHARE_VM_SERVICES_NMT_DCMD_HPP
1.13
1.14 +#if INCLUDE_NMT
1.15 +
1.16 #include "services/diagnosticArgument.hpp"
1.17 #include "services/diagnosticFramework.hpp"
1.18 +#include "services/memBaseline.hpp"
1.19 +#include "services/mallocTracker.hpp"
1.20
1.21 /**
1.22 * Native memory tracking DCmd implementation
1.23 @@ -39,10 +43,7 @@
1.24 DCmdArgument<bool> _summary_diff;
1.25 DCmdArgument<bool> _detail_diff;
1.26 DCmdArgument<bool> _shutdown;
1.27 - DCmdArgument<bool> _auto_shutdown;
1.28 -#ifndef PRODUCT
1.29 - DCmdArgument<bool> _debug;
1.30 -#endif
1.31 + DCmdArgument<bool> _statistics;
1.32 DCmdArgument<char*> _scale;
1.33
1.34 public:
1.35 @@ -61,6 +62,17 @@
1.36 }
1.37 static int num_arguments();
1.38 virtual void execute(DCmdSource source, TRAPS);
1.39 +
1.40 + private:
1.41 + void report(bool summaryOnly, size_t scale);
1.42 + void report_diff(bool summaryOnly, size_t scale);
1.43 +
1.44 + size_t get_scale(const char* scale) const;
1.45 +
1.46 + // check if NMT running at detail tracking level
1.47 + bool check_detail_tracking_level(outputStream* out);
1.48 };
1.49
1.50 +#endif // INCLUDE_NMT
1.51 +
1.52 #endif // SHARE_VM_SERVICES_NMT_DCMD_HPP
