summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSteve Reinhardt <steve.reinhardt@amd.com>2012-08-06 16:52:49 -0700
committerSteve Reinhardt <steve.reinhardt@amd.com>2012-08-06 16:52:49 -0700
commitb647b48bf4d980e26b4626e94f1207ad66fc324e (patch)
tree552ff31c06305500cde480a456a152d94f9e1293 /src
parentd55115936e0711422c6d708572b391e15432bec1 (diff)
downloadgem5-b647b48bf4d980e26b4626e94f1207ad66fc324e.tar.xz
str: add an overloaded startswith() utility method
for various string types and use it in a few places.
Diffstat (limited to 'src')
-rw-r--r--src/base/hostinfo.cc3
-rw-r--r--src/base/str.hh32
-rw-r--r--src/sim/syscall_emul.hh4
-rw-r--r--src/sim/system.cc4
4 files changed, 38 insertions, 5 deletions
diff --git a/src/base/hostinfo.cc b/src/base/hostinfo.cc
index 857ccfa7f..15413de2a 100644
--- a/src/base/hostinfo.cc
+++ b/src/base/hostinfo.cc
@@ -45,6 +45,7 @@
#include <string>
#include "base/misc.hh"
+#include "base/str.hh"
#include "base/types.hh"
using namespace std;
@@ -77,7 +78,7 @@ procInfo(const char *filename, const char *target)
while (fp && !feof(fp) && !done) {
if (fgets(line, 80, fp)) {
- if (strncmp(line, target, strlen(target)) == 0) {
+ if (startswith(line, target)) {
snprintf(format, sizeof(format), "%s %%ld", target);
sscanf(line, format, &usage);
diff --git a/src/base/str.hh b/src/base/str.hh
index 6d617df72..b3f3153ec 100644
--- a/src/base/str.hh
+++ b/src/base/str.hh
@@ -33,6 +33,7 @@
#define __STR_HH__
#include <cctype>
+#include <cstring>
#include <sstream>
#include <string>
#include <vector>
@@ -140,4 +141,35 @@ quote(const std::string &s)
return ret;
}
+
+/**
+ * Return true if 's' starts with the prefix string 'prefix'.
+ */
+inline bool
+startswith(const char *s, const char *prefix)
+{
+ return (strncmp(s, prefix, strlen(prefix)) == 0);
+}
+
+
+/**
+ * Return true if 's' starts with the prefix string 'prefix'.
+ */
+inline bool
+startswith(const std::string &s, const char *prefix)
+{
+ return (s.compare(0, strlen(prefix), prefix) == 0);
+}
+
+
+/**
+ * Return true if 's' starts with the prefix string 'prefix'.
+ */
+inline bool
+startswith(const std::string &s, const std::string &prefix)
+{
+ return (s.compare(0, prefix.size(), prefix) == 0);
+}
+
+
#endif //__STR_HH__
diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh
index 0627d8d91..b2786e572 100644
--- a/src/sim/syscall_emul.hh
+++ b/src/sim/syscall_emul.hh
@@ -640,8 +640,8 @@ openFunc(SyscallDesc *desc, int callnum, LiveProcess *process,
DPRINTF(SyscallVerbose, "opening file %s\n", path.c_str());
int fd;
- if (!path.compare(0, 6, "/proc/") || !path.compare(0, 8, "/system/") ||
- !path.compare(0, 10, "/platform/") || !path.compare(0, 5, "/sys/")) {
+ if (startswith(path, "/proc/") || startswith(path, "/system/") ||
+ startswith(path, "/platform/") || startswith(path, "/sys/")) {
// It's a proc/sys entery and requires special handling
fd = OS::openSpecialFile(path, process, tc);
return (fd == -1) ? -1 : process->alloc_fd(fd,path.c_str(),hostFlags,mode, false);
diff --git a/src/sim/system.cc b/src/sim/system.cc
index 67fb7480a..20fcbd948 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -51,6 +51,7 @@
#include "arch/vtophys.hh"
#include "base/loader/object_file.hh"
#include "base/loader/symtab.hh"
+#include "base/str.hh"
#include "base/trace.hh"
#include "config/the_isa.hh"
#include "cpu/thread_context.hh"
@@ -402,8 +403,7 @@ MasterID
System::getMasterId(std::string master_name)
{
// strip off system name if the string starts with it
- if (master_name.size() > name().size() &&
- master_name.compare(0, name().size(), name()) == 0)
+ if (startswith(master_name, name()))
master_name = master_name.erase(0, name().size() + 1);
// CPUs in switch_cpus ask for ids again after switching