---

yaml
---
r: 80605
b: refs/heads/auto
c: af65057
h: refs/heads/master
i:
  80603: ea71c4e
v: v3

Author: olsonjeffery

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 66ecff2b136dccabae98d2413632ff5177313205
+refs/heads/auto: af650572e0fceb94b387db50ee31f19ee000fe4b
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/mk/platform.mk

@@ -47,11 +47,8 @@ else
   CFG_GCCISH_CFLAGS += -O2
 endif
 
-# The soname thing is for supporting a statically linked jemalloc.
-# see https://blog.mozilla.org/jseward/2012/06/05/valgrind-now-supports-jemalloc-builds-directly/
 ifdef CFG_VALGRIND
   CFG_VALGRIND += --error-exitcode=100 \
-                  --soname-synonyms=somalloc=NONE \
                   --quiet \
                   --suppressions=$(CFG_SRC_DIR)src/etc/x86.supp \
                   $(OS_SUPP)

branches/auto/src/libstd/rt/io/file.rs

@@ -11,12 +11,15 @@
 use prelude::*;
 use super::support::PathLike;
 use super::{Reader, Writer, Seek};
-use super::{SeekSet, SeekCur, SeekEnd, SeekStyle};
+use super::{SeekStyle,SeekSet, SeekCur, SeekEnd,
+            Open, Read, Create, ReadWrite};
 use rt::rtio::{RtioFileStream, IoFactory, IoFactoryObject};
 use rt::io::{io_error, read_error, EndOfFile,
-             FileMode, FileAccess, Open, Read, Create, ReadWrite};
+            FileMode, FileAccess, FileStat};
 use rt::local::Local;
-use rt::test::*;
+use option::{Some, None};
+use path::Path;
+use super::super::test::*;
 
 /// Open a file for reading/writing, as indicated by `path`.
 pub fn open<P: PathLike>(path: &P,
@@ -145,6 +148,123 @@ impl Seek for FileStream {
     }
 }
 
+pub struct FileInfo(Path);
+
+/// FIXME: DOCS
+impl<'self> FileInfo {
+    pub fn new<P: PathLike>(path: &P) -> FileInfo {
+        do path.path_as_str |p| {
+            FileInfo(Path(p))
+        }
+    }
+    // FIXME #8873 can't put this in FileSystemInfo
+    pub fn get_path(&'self self) -> &'self Path {
+        &(**self)
+    }
+    pub fn stat(&self) -> Option<FileStat> {
+        do io_error::cond.trap(|_| {
+            // FIXME: can we do something more useful here?
+        }).inside {
+            stat(self.get_path())
+        }
+    }
+    pub fn exists(&self) -> bool {
+        match self.stat() {
+            Some(s) => {
+                match s.is_file {
+                    true => {
+                        true
+                    },
+                    false => {
+                        // FIXME: raise condition?
+                        false
+                    }
+                }
+            },
+            None => false
+        }
+    }
+    pub fn is_file(&self) -> bool {
+        match self.stat() {
+            Some(s) => s.is_file,
+            None => {
+                // FIXME: raise condition
+                false
+            }
+        }
+    }
+    pub fn open(&self, mode: FileMode, access: FileAccess) -> Option<FileStream> {
+        match self.is_file() {
+            true => {
+                open(self.get_path(), mode, access)
+            },
+            false => {
+                // FIXME: raise condition
+                None
+            }
+        }
+    }
+    //fn open_read(&self) -> FileStream;
+    //fn open_write(&self) -> FileStream;
+    //fn create(&self) -> FileStream;
+    //fn truncate(&self) -> FileStream;
+    //fn open_or_create(&self) -> FileStream;
+    //fn create_or_truncate(&self) -> FileStream;
+    //fn unlink(&self);
+}
+
+/*
+/// FIXME: DOCS
+impl DirectoryInfo<'self> {
+    fn new<P: PathLike>(path: &P) -> FileInfo {
+        FileInfo(Path(path.path_as_str()))
+    }
+    // FIXME #8873 can't put this in FileSystemInfo
+    fn get_path(&'self self) -> &'self Path {
+        &*self
+    }
+    fn stat(&self) -> Option<FileStat> {
+        file::stat(self.get_path())
+    }
+    fn exists(&self) -> bool {
+        do io_error::cond.trap(|_| {
+        }).inside {
+            match self.stat() {
+                Some(_) => true,
+                None => false
+            }
+        }
+    }
+    fn is_dir(&self) -> bool {
+        
+    }
+    fn create(&self);
+    fn get_subdirs(&self, filter: &str) -> ~[Path];
+    fn get_files(&self, filter: &str) -> ~[Path];
+}
+*/
+
+/// Given a `rt::io::support::PathLike`, query the file system to get
+/// information about a file, directory, etc.
+///
+/// Returns a `Some(PathInfo)` on success, and raises a `rt::io::IoError` condition
+/// on failure and returns `None`.
+pub fn stat<P: PathLike>(path: &P) -> Option<FileStat> {
+    let open_result = unsafe {
+        let io: *mut IoFactoryObject = Local::unsafe_borrow();
+        (*io).fs_stat(path)
+    };
+    match open_result {
+        Ok(p) => {
+            Some(p)
+        },
+        Err(ioerr) => {
+            read_error::cond.raise(ioerr);
+            None
+        }
+    }
+}
+
 fn file_test_smoke_test_impl() {
     do run_in_mt_newsched_task {
         let message = "it's alright. have a good time";
@@ -273,7 +393,6 @@ fn file_test_io_seek_and_tell_smoke_test() {
 }
 
 fn file_test_io_seek_and_write_impl() {
-    use io;
     do run_in_mt_newsched_task {
         use str;
         let initial_msg =   "food-is-yummy";
@@ -293,8 +412,7 @@ fn file_test_io_seek_and_write_impl() {
             read_stream.read(read_mem);
         }
         unlink(filename);
-        let read_str = str::from_utf8(read_mem);
-        io::println(fmt!("read_str: '%?' final_msg: '%?'", read_str, final_msg));
+        let read_str = str::from_bytes(read_mem);
         assert!(read_str == final_msg.to_owned());
     }
 }
@@ -343,3 +461,35 @@ fn file_test_io_seek_shakedown_impl() {
 fn file_test_io_seek_shakedown() {
     file_test_io_seek_shakedown_impl();
 }
+
+#[test]
+fn file_test_stat_is_correct_on_is_file() {
+    do run_in_newsched_task {
+        let filename = &Path("./tmp/file_stat_correct_on_is_file.txt");
+        {
+            let mut fs = open(filename, Create, ReadWrite).unwrap();
+            let msg = "hw";
+            fs.write(msg.as_bytes());
+        }
+        let stat_res = match stat(filename) {
+            Some(s) => s,
+            None => fail!("shouldn't happen")
+        };
+        assert!(stat_res.is_file);
+    }
+}
+
+#[test]
+fn file_test_stat_is_correct_on_is_dir() {
+    //assert!(false);
+}
+
+#[test]
+fn file_test_fileinfo_false_when_checking_is_file_on_a_directory() {
+    //assert!(false);
+}
+
+#[test]
+fn file_test_fileinfo_check_exists_before_and_after_file_creation() {
+    //assert!(false);
+}

branches/auto/src/libstd/rt/io/mod.rs

@@ -245,6 +245,7 @@ Out of scope
 use prelude::*;
 use to_str::ToStr;
 use str::{StrSlice, OwnedStr};
+use path::Path;
 
 // Reexports
 pub use self::stdio::stdin;
@@ -596,3 +597,26 @@ pub enum FileAccess {
     Write,
     ReadWrite
 }
+
+pub struct FileStat {
+    /// A `Path` object containing information about the `PathInfo`'s location
+    path: Path,
+    /// `true` if the file pointed at by the `PathInfo` is a regular file
+    is_file: bool,
+    /// `true` if the file pointed at by the `PathInfo` is a directory
+    is_dir: bool
+    // `true` if the file pointed at by the `PathInfo` is a link (what this means
+    // is platform dependant)
+    /*
+    /// The file pointed at by the `PathInfo`'s size in bytes
+    size: u64,
+    /// The file pointed at by the `PathInfo`'s time date in platform-dependent msecs
+    created: u64,
+    /// The file pointed at by the `PathInfo`'s last-modification time in
+    /// platform-dependent msecs
+    modified: u64,
+    /// The file pointed at by the `PathInfo`'s last-accessd time (e.g. read) in
+    /// platform-dependent msecs
+    accessed: u64,
+    */
+}

branches/auto/src/libstd/rt/rtio.rs

@@ -18,7 +18,7 @@ use rt::uv::uvio;
 use path::Path;
 use super::io::support::PathLike;
 use super::io::{SeekStyle};
-use super::io::{FileMode, FileAccess};
+use super::io::{FileMode, FileAccess, FileStat};
 
 // XXX: ~object doesn't work currently so these are some placeholder
 // types to use instead
@@ -74,6 +74,13 @@ pub trait IoFactory {
         -> Result<~RtioFileStream, IoError>;
     fn fs_unlink<P: PathLike>(&mut self, path: &P) -> Result<(), IoError>;
     fn get_host_addresses(&mut self, host: &str) -> Result<~[IpAddr], IoError>;
+    fn fs_stat<P: PathLike>(&mut self, path: &P) -> Result<FileStat, IoError>;
+    //fn fs_fstat(&mut self, fd: c_int) -> Result<FileStat, IoError>;
+}
+
+pub trait RtioStream {
+    fn read(&mut self, buf: &mut [u8]) -> Result<uint, IoError>;
+    fn write(&mut self, buf: &[u8]) -> Result<(), IoError>;
 }
 
 pub trait RtioTcpListener : RtioSocket {