Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement proper handling of dirent in FormulationManager, fixes #517 #518

Merged
merged 1 commit into from
Apr 27, 2023
Merged

Implement proper handling of dirent in FormulationManager, fixes #517 #518

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 39 additions & 12 deletions include/realizations/catchment/Formulation_Manager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <tuple>
#include <functional>
#include <dirent.h>
#include <sys/stat.h>
#include <regex>

#include <boost/property_tree/ptree.hpp>
Expand Down Expand Up @@ -411,19 +412,45 @@ namespace realization {

// If the directory could be found and opened, we can go ahead and iterate
if (directory != nullptr) {
bool match;
while ((entry = readdir(directory))) {
// If the entry is a regular file or symlink AND the name matches the pattern,
// we can consider this ready to be interpretted as valid forcing data (even if it isn't)
if ((entry->d_type == DT_REG or entry->d_type == DT_LNK) and std::regex_match(entry->d_name, pattern)) {
return forcing_params(
path + entry->d_name,
provider,
simulation_time_config.start_time,
simulation_time_config.end_time
);
}
}
}
match = std::regex_match(entry->d_name, pattern);
if( match ) {
// If the entry is a regular file or symlink AND the name matches the pattern,
// we can consider this ready to be interpretted as valid forcing data (even if it isn't)
#ifdef _DIRENT_HAVE_D_TYPE
if ( entry->d_type == DT_REG or entry->d_type == DT_LNK ) {
return forcing_params(
path + entry->d_name,
provider,
simulation_time_config.start_time,
simulation_time_config.end_time
);
}
else if ( entry->d_type == DT_UNKNOWN )
#endif
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is throwing me off - if the _DIRENT_HAVE_D_TYPE condition doesn't pass, does this yield:

if( match ) {
    {
        struct stat st;
        if( stat((path+entry->d_name)>c_str(), &st) != 0) {...
    }
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it might be a little easier to see from this SS where the IDE does some nice high/low lighting

image

//dirent is not guaranteed to provide propoer file type identification in d_type
//so if a system returns unknown or it isn't supported, need to use stat to determine if it is a file
struct stat st;
if( stat((path+entry->d_name).c_str(), &st) != 0) {
throw std::runtime_error("Could not stat file "+path+entry->d_name);
}
if( S_ISREG(st.st_mode) ) {
//Sinde we used stat and not lstat, we get the result of the target of links as well
//so this covers both cases we are interested in.
return forcing_params(
path + entry->d_name,
provider,
simulation_time_config.start_time,
simulation_time_config.end_time
);
}
throw std::runtime_error("Forcing data is path "+path+entry->d_name+" is not a file");
}
} //no match found, try next entry
} // end while iter dir
} //end if directory
else {
// The directory wasn't found or otherwise couldn't be opened; forcing data cannot be retrieved
throw std::runtime_error("Error opening forcing data dir '" + path + "' after " + std::to_string(attemptCount) + " attempts: " + errMsg);
Expand Down