[rocprofv3] SQLite3 database output (rocpd) support + rocprofiler-sdk-rocpd (#403)
* [rocprofv3] rocpd SQLite3 database output support
* Move counters xml and yaml to source/share/rocprofiler-sdk
- more representative of install hierarchy
* Add share/rocprofiler-sdk/rocpd SQL files
* Experimental rocprofiler-sdk SQL API
* rocprofv3 default output format is rocpd
* Fix rocpd event ids for counter collection w/o kernel dispatch
* Remove fktable entries from rocpd_tables.sql
* Fix rocpd schema path
* Fix install component for roctx python bindings
* rocprofiler-sdk-rocpd
- create include/rocprofiler-sdk-rocpd
- create rocprofiler-sdk-rocpd library, package, etc.
- default all "guid" fields to "{{guid}}" in tables
- remove "{{view_uuid}}" support (always unused)
* Migrate rocprofv3 to use rocprofiler-sdk-rocpd
* Fix missing foreign key reference
* Revert change
* Fix cmake comment
* Fix maybe-uninitialized compiler warning
* Fix maybe-uninitialized compiler warning
* Add logging to rocpd_sql_load_schema
* Improve string sanitization when inserting json strings
* Initialize rocpd logging on rocprofiler-sdk-rocpd library load
* Revert lib/output/generatePerfetto.cpp changes
* [temporary] Tweak rocprofv3-test-list-avail-trace-execute test log level
* Update get_install_path for lib/rocprofiler-sdk-rocpd/sql.cpp
- try to resolve issues on RHEL/SLES for dladdr
* Update lib/common/logging.cpp
- enable environ overrides
* dlsym for rocpd_sql_load_schema
* Make dl_info.dli_fname lexically normal
* Implement node_info alternatives if /etc/machine-id does not exist
* Misc include fixes
* SHA256 and UUIDv7 support
* Implement UUIDv7 in generateRocpd.cpp
* Support push/pop environment variables
* Minor tweak
* Fix glog segfaults when unsetting glog env
* Updated CHANGELOG
* Updates tests/pytest-packages
- rocpd_reader.py: RocpdReader
* Update tests / marker_views.sql
- add test_rocpd_data
* Update rocpd_tables.sql
- Use AUTOINCREMENT
- insert "uuid" and "guid" into rocpd_metadata
* Minor updates to generateRocpd.cpp
- don't quote GUID
- use sqlite3_open_v2
- use sqlite3_close_v2
* Update execute_raw_sql_statements_impl
- uses sqlite3_last_insert_rowid for autoincrement
* Update SQL deferred_transaction
- CI check for nullptr to connection
* Apply suggestions from code review
Co-authored-by: Welton, Benjamin <Benjamin.Welton@amd.com>
* Code review updates
- formatting
- replace if with switch
- remove loop for {{uuid}}
* Fix pmc_groups handling in rocprofv3
* Address code review feedback
- Include rocm_version in rocprofv3 version info
- Note `--version` option for `rocprofv3` in CHANGELOG.md
- remove commented out code
* Fix packaging dependencies
* Fix install package step of CI workflow
* Fix install package step of CI workflow
---------
Co-authored-by: Jonathan R. Madsen <jonathanrmadsen@gmail.com>
Co-authored-by: Welton, Benjamin <Benjamin.Welton@amd.com>
This commit is contained in:
@@ -53,6 +53,34 @@ struct log_level_info
|
||||
int32_t google_level = 0;
|
||||
int32_t verbose_level = 0;
|
||||
};
|
||||
|
||||
env_store
|
||||
get_glog_env_config(const logging_config& cfg)
|
||||
{
|
||||
auto as_env_config = [](std::string_view _var, auto _val) {
|
||||
return env_config{std::string{_var}, fmt::format("{}", _val), 1};
|
||||
};
|
||||
|
||||
auto _data = std::vector<env_config>{
|
||||
as_env_config("GLOG_minloglevel", cfg.loglevel),
|
||||
as_env_config("GLOG_logtostderr", cfg.logtostderr ? 1 : 0),
|
||||
as_env_config("GLOG_alsologtostderr", cfg.alsologtostderr ? 1 : 0),
|
||||
as_env_config("GLOG_stderrthreshold", cfg.loglevel),
|
||||
as_env_config("GLOG_v", cfg.vlog_level),
|
||||
};
|
||||
|
||||
if(!cfg.logdir.empty())
|
||||
{
|
||||
_data.emplace_back(as_env_config("GOOGLE_LOG_DIR", cfg.logdir));
|
||||
_data.emplace_back(as_env_config("GLOG_log_dir", cfg.logdir));
|
||||
}
|
||||
if(!cfg.vlog_modules.empty())
|
||||
{
|
||||
_data.emplace_back(as_env_config("GLOG_vmodule", cfg.vlog_modules));
|
||||
}
|
||||
|
||||
return env_store{std::move(_data)};
|
||||
}
|
||||
} // namespace
|
||||
|
||||
void
|
||||
@@ -139,7 +167,10 @@ init_logging(std::string_view env_prefix, logging_config cfg)
|
||||
}
|
||||
}
|
||||
|
||||
update_logging(cfg, !google::IsGoogleLoggingInitialized());
|
||||
auto _env_store = get_glog_env_config(cfg);
|
||||
|
||||
update_logging(cfg);
|
||||
_env_store.push();
|
||||
|
||||
if(!google::IsGoogleLoggingInitialized())
|
||||
{
|
||||
@@ -158,11 +189,13 @@ init_logging(std::string_view env_prefix, logging_config cfg)
|
||||
|
||||
ROCP_INFO << "logging initialized via " << fmt::format("{}_LOG_LEVEL", env_prefix)
|
||||
<< ". Log Level: " << loglvl << ". Verbose Log Level: " << vlog_level;
|
||||
|
||||
_env_store.pop(false);
|
||||
});
|
||||
}
|
||||
|
||||
void
|
||||
update_logging(const logging_config& cfg, bool setup_env, int env_override)
|
||||
update_logging(const logging_config& cfg)
|
||||
{
|
||||
static auto _mtx = std::mutex{};
|
||||
auto _lk = std::unique_lock<std::mutex>{_mtx};
|
||||
@@ -192,22 +225,6 @@ update_logging(const logging_config& cfg, bool setup_env, int env_override)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(setup_env)
|
||||
{
|
||||
common::set_env("GLOG_minloglevel", cfg.loglevel, env_override);
|
||||
common::set_env("GLOG_logtostderr", cfg.logtostderr ? 1 : 0, env_override);
|
||||
common::set_env("GLOG_alsologtostderr", cfg.alsologtostderr ? 1 : 0, env_override);
|
||||
common::set_env("GLOG_stderrthreshold", cfg.loglevel, env_override);
|
||||
common::set_env("GLOG_v", cfg.vlog_level, env_override);
|
||||
if(!cfg.logdir.empty())
|
||||
{
|
||||
common::set_env("GOOGLE_LOG_DIR", cfg.logdir, env_override);
|
||||
common::set_env("GLOG_log_dir", cfg.logdir, env_override);
|
||||
}
|
||||
if(!cfg.vlog_modules.empty())
|
||||
common::set_env("GLOG_vmodule", cfg.vlog_modules, env_override);
|
||||
}
|
||||
}
|
||||
} // namespace common
|
||||
} // namespace rocprofiler
|
||||
|
||||
Reference in New Issue
Block a user