Mercurial > hg > truffle

comparison src/os/windows/vm/perfMemory_windows.cpp @ 1355:6ccd32c284ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kamg
date Wed, 07 Apr 2010 12:28:22 -0400
parents a2ea687fdc7c
children c18cbe5936b8
comparison
equal deleted inserted replaced
1352:895d9ade6111 1355:6ccd32c284ac
147 // 147 //
148 static char* get_user_tmp_dir(const char* user) { 148 static char* get_user_tmp_dir(const char* user) {
149 149
150 const char* tmpdir = os::get_temp_directory(); 150 const char* tmpdir = os::get_temp_directory();
151 const char* perfdir = PERFDATA_NAME; 151 const char* perfdir = PERFDATA_NAME;
152 size_t nbytes = strlen(tmpdir) + strlen(perfdir) + strlen(user) + 2; 152 size_t nbytes = strlen(tmpdir) + strlen(perfdir) + strlen(user) + 3;
153 char* dirname = NEW_C_HEAP_ARRAY(char, nbytes); 153 char* dirname = NEW_C_HEAP_ARRAY(char, nbytes);
154 154
155 // construct the path name to user specific tmp directory 155 // construct the path name to user specific tmp directory
156 _snprintf(dirname, nbytes, "%s%s_%s", tmpdir, perfdir, user); 156 _snprintf(dirname, nbytes, "%s\\%s_%s", tmpdir, perfdir, user);
157 157
158 return dirname; 158 return dirname;
159 } 159 }
160 160
161 // convert the given file name into a process id. if the file 161 // convert the given file name into a process id. if the file
316 if (strncmp(dentry->d_name, PERFDATA_NAME, strlen(PERFDATA_NAME)) != 0) { 316 if (strncmp(dentry->d_name, PERFDATA_NAME, strlen(PERFDATA_NAME)) != 0) {
317 continue; 317 continue;
318 } 318 }
319 319
320 char* usrdir_name = NEW_C_HEAP_ARRAY(char, 320 char* usrdir_name = NEW_C_HEAP_ARRAY(char,
321 strlen(tmpdirname) + strlen(dentry->d_name) + 1); 321 strlen(tmpdirname) + strlen(dentry->d_name) + 2);
322 strcpy(usrdir_name, tmpdirname); 322 strcpy(usrdir_name, tmpdirname);
323 strcat(usrdir_name, "\\");
323 strcat(usrdir_name, dentry->d_name); 324 strcat(usrdir_name, dentry->d_name);
324 325
325 DIR* subdirp = os::opendir(usrdir_name); 326 DIR* subdirp = os::opendir(usrdir_name);
326 327
327 if (subdirp == NULL) { 328 if (subdirp == NULL) {