lordgamez commented on a change in pull request #1032: URL: https://github.com/apache/nifi-minifi-cpp/pull/1032#discussion_r619063072
########## File path: libminifi/include/utils/ProcessCPUUsageTracker.h ########## @@ -0,0 +1,96 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef LIBMINIFI_INCLUDE_UTILS_PROCESSCPUUSAGETRACKER_H_ +#define LIBMINIFI_INCLUDE_UTILS_PROCESSCPUUSAGETRACKER_H_ + +#if defined(__linux__) || defined(__APPLE__) +#include <time.h> +#endif + +#ifdef WIN32 +#include <cstdint> +#include "windows.h" +#endif +namespace org { +namespace apache { +namespace nifi { +namespace minifi { +namespace utils { + +class ProcessCPUUsageTrackerBase { + public: + ProcessCPUUsageTrackerBase() = default; + virtual ~ProcessCPUUsageTrackerBase() = default; + virtual double getCPUUsageAndRestartCollection() = 0; +}; + +#if defined(__linux__) || defined(__APPLE__) Review comment: Just a personal thought, but if all the implementation details are different on windows and unix platforms, maybe we could have separate files for windows and unix implementations and include the appropriate header file in compilation time. What do you think? Same for the SystemCPUUsageTracker ########## File path: libminifi/include/utils/ProcessCPUUsageTracker.h ########## @@ -0,0 +1,96 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef LIBMINIFI_INCLUDE_UTILS_PROCESSCPUUSAGETRACKER_H_ +#define LIBMINIFI_INCLUDE_UTILS_PROCESSCPUUSAGETRACKER_H_ + +#if defined(__linux__) || defined(__APPLE__) +#include <time.h> +#endif + +#ifdef WIN32 +#include <cstdint> +#include "windows.h" +#endif Review comment: Could be a bit shorter ``` c++ #ifdef WIN32 #include <cstdint> #include "windows.h" #else #include <time.h> #endif ``` ########## File path: libminifi/include/utils/ProcessCPUUsageTracker.h ########## @@ -0,0 +1,96 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef LIBMINIFI_INCLUDE_UTILS_PROCESSCPUUSAGETRACKER_H_ +#define LIBMINIFI_INCLUDE_UTILS_PROCESSCPUUSAGETRACKER_H_ Review comment: We should use `#pragma once` for all new headers. ########## File path: libminifi/include/utils/ValueParser.h ########## @@ -119,6 +119,17 @@ class ValueParser { return *this; } + ValueParser& parse(double& out) { + double result; // NOLINT Review comment: Could we just initialize this to 0 to satisfy the linter? ########## File path: libminifi/include/utils/ValueCaster.h ########## @@ -0,0 +1,48 @@ +/** + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenseas/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef LIBMINIFI_INCLUDE_UTILS_VALUECASTER_H_ +#define LIBMINIFI_INCLUDE_UTILS_VALUECASTER_H_ + +namespace org { +namespace apache { +namespace nifi { +namespace minifi { +namespace utils { +namespace internal { + +template<class T, class U> +bool cast_if_in_range(T in, U& out) { Review comment: I'm a bit conflicted about this as usually casts follow the `snake_case` style, but our code should follow the `camelCase` for function names. ########## File path: libminifi/include/utils/ProcessCPUUsageTracker.h ########## @@ -0,0 +1,96 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef LIBMINIFI_INCLUDE_UTILS_PROCESSCPUUSAGETRACKER_H_ +#define LIBMINIFI_INCLUDE_UTILS_PROCESSCPUUSAGETRACKER_H_ + +#if defined(__linux__) || defined(__APPLE__) +#include <time.h> +#endif + +#ifdef WIN32 +#include <cstdint> +#include "windows.h" +#endif +namespace org { +namespace apache { +namespace nifi { +namespace minifi { +namespace utils { + +class ProcessCPUUsageTrackerBase { + public: + ProcessCPUUsageTrackerBase() = default; + virtual ~ProcessCPUUsageTrackerBase() = default; + virtual double getCPUUsageAndRestartCollection() = 0; +}; + +#if defined(__linux__) || defined(__APPLE__) +class ProcessCPUUsageTracker : ProcessCPUUsageTrackerBase { + public: + ProcessCPUUsageTracker(); + ~ProcessCPUUsageTracker() = default; + double getCPUUsageAndRestartCollection() override; + + protected: + void queryCPUTimes(); + bool isCurrentQueryOlderThanPrevious(); + bool isCurrentQuerySameAsPrevious(); Review comment: The `isCurrent*` functions could be const. Same comment for `SystemCPUUsageTracker` class. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
