Move the benchmarks into a benches/ directory

benches/bench_struct.rs

@@ -0,0 +1,521 @@
+#![feature(phase)]
+
+#[phase(plugin)]
+extern crate serde_macros;
+
+extern crate serde;
+extern crate serialize;
+extern crate test;
+
+use std::collections::HashMap;
+use test::Bencher;
+
+use serialize::{Decoder, Decodable};
+
+use serde::de::{Deserializer, Deserializable};
+
+//////////////////////////////////////////////////////////////////////////////
+
+#[deriving(Clone, PartialEq, Show, Decodable)]
+#[deriving_deserializable]
+struct Inner {
+    a: (),
+    b: uint,
+    c: HashMap<String, Option<char>>,
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+#[deriving(Clone, PartialEq, Show, Decodable)]
+#[deriving_deserializable]
+struct Outer {
+    inner: Vec<Inner>,
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+#[deriving(Show)]
+enum Error {
+    EndOfStream,
+    SyntaxError,
+    OtherError(String),
+}
+
+mod decoder {
+    use std::collections::HashMap;
+    use serialize::Decoder;
+
+    use super::{Outer, Inner, Error, SyntaxError, OtherError};
+
+    #[deriving(Show)]
+    enum State {
+        OuterState(Outer),
+        InnerState(Inner),
+        NullState,
+        UintState(uint),
+        CharState(char),
+        StringState(String),
+        FieldState(&'static str),
+        VecState(Vec<Inner>),
+        MapState(HashMap<String, Option<char>>),
+        OptionState(bool),
+    }
+
+    pub struct OuterDecoder {
+        stack: Vec<State>,
+
+    }
+
+    impl OuterDecoder {
+        #[inline]
+        pub fn new(animal: Outer) -> OuterDecoder {
+            OuterDecoder {
+                stack: vec!(OuterState(animal)),
+            }
+        }
+    }
+
+    impl Decoder<Error> for OuterDecoder {
+        fn error(&mut self, msg: &str) -> Error {
+            OtherError(msg.to_string())
+        }
+
+        // Primitive types:
+        #[inline]
+        fn read_nil(&mut self) -> Result<(), Error> {
+            match self.stack.pop() {
+                Some(NullState) => Ok(()),
+                _ => Err(SyntaxError),
+            }
+        }
+        #[inline]
+        fn read_uint(&mut self) -> Result<uint, Error> {
+            match self.stack.pop() {
+                Some(UintState(value)) => Ok(value),
+                _ => Err(SyntaxError),
+            }
+        }
+        fn read_u64(&mut self) -> Result<u64, Error> { Err(SyntaxError) }
+        fn read_u32(&mut self) -> Result<u32, Error> { Err(SyntaxError) }
+        fn read_u16(&mut self) -> Result<u16, Error> { Err(SyntaxError) }
+        fn read_u8(&mut self) -> Result<u8, Error> { Err(SyntaxError) }
+        fn read_int(&mut self) -> Result<int, Error> { Err(SyntaxError) }
+        fn read_i64(&mut self) -> Result<i64, Error> { Err(SyntaxError) }
+        fn read_i32(&mut self) -> Result<i32, Error> { Err(SyntaxError) }
+        fn read_i16(&mut self) -> Result<i16, Error> { Err(SyntaxError) }
+        fn read_i8(&mut self) -> Result<i8, Error> { Err(SyntaxError) }
+        fn read_bool(&mut self) -> Result<bool, Error> { Err(SyntaxError) }
+        fn read_f64(&mut self) -> Result<f64, Error> { Err(SyntaxError) }
+        fn read_f32(&mut self) -> Result<f32, Error> { Err(SyntaxError) }
+        #[inline]
+        fn read_char(&mut self) -> Result<char, Error> {
+            match self.stack.pop() {
+                Some(CharState(c)) => Ok(c),
+                _ => Err(SyntaxError),
+            }
+        }
+        #[inline]
+        fn read_str(&mut self) -> Result<String, Error> {
+            match self.stack.pop() {
+                Some(StringState(value)) => Ok(value),
+                _ => Err(SyntaxError),
+            }
+        }
+
+        // Compound types:
+        fn read_enum<T>(&mut self, _name: &str, _f: |&mut OuterDecoder| -> Result<T, Error>) -> Result<T, Error> { Err(SyntaxError) }
+
+        fn read_enum_variant<T>(&mut self,
+                                _names: &[&str],
+                                _f: |&mut OuterDecoder, uint| -> Result<T, Error>)
+                                -> Result<T, Error> { Err(SyntaxError) }
+        fn read_enum_variant_arg<T>(&mut self,
+                                    _a_idx: uint,
+                                    _f: |&mut OuterDecoder| -> Result<T, Error>)
+                                    -> Result<T, Error> { Err(SyntaxError) }
+
+        fn read_enum_struct_variant<T>(&mut self,
+                                       _names: &[&str],
+                                       _f: |&mut OuterDecoder, uint| -> Result<T, Error>)
+                                       -> Result<T, Error> { Err(SyntaxError) }
+        fn read_enum_struct_variant_field<T>(&mut self,
+                                             _f_name: &str,
+                                             _f_idx: uint,
+                                             _f: |&mut OuterDecoder| -> Result<T, Error>)
+                                             -> Result<T, Error> { Err(SyntaxError) }
+
+        #[inline]
+        fn read_struct<T>(&mut self, s_name: &str, _len: uint, f: |&mut OuterDecoder| -> Result<T, Error>) -> Result<T, Error> {
+            match self.stack.pop() {
+                Some(OuterState(Outer { inner: inner })) => {
+                    if s_name == "Outer" {
+                        self.stack.push(VecState(inner));
+                        self.stack.push(FieldState("inner"));
+                        f(self)
+                    } else {
+                        Err(SyntaxError)
+                    }
+                }
+                Some(InnerState(Inner { a: (), b: b, c: c })) => {
+                    if s_name == "Inner" {
+                        self.stack.push(MapState(c));
+                        self.stack.push(FieldState("c"));
+
+                        self.stack.push(UintState(b));
+                        self.stack.push(FieldState("b"));
+
+                        self.stack.push(NullState);
+                        self.stack.push(FieldState("a"));
+                        f(self)
+                    } else {
+                        Err(SyntaxError)
+                    }
+                }
+                _ => Err(SyntaxError),
+            }
+        }
+        #[inline]
+        fn read_struct_field<T>(&mut self, f_name: &str, _f_idx: uint, f: |&mut OuterDecoder| -> Result<T, Error>) -> Result<T, Error> {
+            match self.stack.pop() {
+                Some(FieldState(name)) => {
+                    if f_name == name {
+                        f(self)
+                    } else {
+                        Err(SyntaxError)
+                    }
+                }
+                _ => Err(SyntaxError)
+            }
+        }
+
+        fn read_tuple<T>(&mut self, _f: |&mut OuterDecoder, uint| -> Result<T, Error>) -> Result<T, Error> { Err(SyntaxError) }
+        fn read_tuple_arg<T>(&mut self, _a_idx: uint, _f: |&mut OuterDecoder| -> Result<T, Error>) -> Result<T, Error> { Err(SyntaxError) }
+
+        fn read_tuple_struct<T>(&mut self,
+                                _s_name: &str,
+                                _f: |&mut OuterDecoder, uint| -> Result<T, Error>)
+                                -> Result<T, Error> { Err(SyntaxError) }
+        fn read_tuple_struct_arg<T>(&mut self,
+                                    _a_idx: uint,
+                                    _f: |&mut OuterDecoder| -> Result<T, Error>)
+                                    -> Result<T, Error> { Err(SyntaxError) }
+
+        // Specialized types:
+        #[inline]
+        fn read_option<T>(&mut self, f: |&mut OuterDecoder, bool| -> Result<T, Error>) -> Result<T, Error> {
+            match self.stack.pop() {
+                Some(OptionState(b)) => f(self, b),
+                _ => Err(SyntaxError),
+            }
+        }
+
+        #[inline]
+        fn read_seq<T>(&mut self, f: |&mut OuterDecoder, uint| -> Result<T, Error>) -> Result<T, Error> {
+            match self.stack.pop() {
+                Some(VecState(value)) => {
+                    let len = value.len();
+                    for inner in value.move_iter().rev() {
+                        self.stack.push(InnerState(inner));
+                    }
+                    f(self, len)
+                }
+                _ => Err(SyntaxError)
+            }
+        }
+        #[inline]
+        fn read_seq_elt<T>(&mut self, _idx: uint, f: |&mut OuterDecoder| -> Result<T, Error>) -> Result<T, Error> {
+            f(self)
+        }
+
+        #[inline]
+        fn read_map<T>(&mut self, f: |&mut OuterDecoder, uint| -> Result<T, Error>) -> Result<T, Error> {
+            match self.stack.pop() {
+                Some(MapState(map)) => {
+                    let len = map.len();
+                    for (key, value) in map.move_iter() {
+                        match value {
+                            Some(c) => {
+                                self.stack.push(CharState(c));
+                                self.stack.push(OptionState(true));
+                            }
+                            None => {
+                                self.stack.push(OptionState(false));
+                            }
+                        }
+                        self.stack.push(StringState(key));
+                    }
+                    f(self, len)
+                }
+                _ => Err(SyntaxError),
+            }
+        }
+        #[inline]
+        fn read_map_elt_key<T>(&mut self, _idx: uint, f: |&mut OuterDecoder| -> Result<T, Error>) -> Result<T, Error> {
+            f(self)
+        }
+        #[inline]
+        fn read_map_elt_val<T>(&mut self, _idx: uint, f: |&mut OuterDecoder| -> Result<T, Error>) -> Result<T, Error> {
+            f(self)
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+mod deserializer {
+    use std::collections::HashMap;
+    use super::{Outer, Inner, Error, EndOfStream, SyntaxError};
+    use serde::de;
+
+    enum State {
+        OuterState(Outer),
+        InnerState(Inner),
+        FieldState(&'static str),
+        NullState,
+        UintState(uint),
+        CharState(char),
+        StringState(String),
+        OptionState(bool),
+        TupleState(uint),
+        VecState(Vec<Inner>),
+        MapState(HashMap<String, Option<char>>),
+        EndState,
+
+    }
+
+    pub struct OuterDeserializer {
+        stack: Vec<State>,
+    }
+
+    impl OuterDeserializer {
+        #[inline]
+        pub fn new(outer: Outer) -> OuterDeserializer {
+            OuterDeserializer {
+                stack: vec!(OuterState(outer)),
+            }
+        }
+    }
+
+    impl Iterator<Result<de::Token, Error>> for OuterDeserializer {
+        #[inline]
+        fn next(&mut self) -> Option<Result<de::Token, Error>> {
+            match self.stack.pop() {
+                Some(OuterState(Outer { inner })) => {
+                    self.stack.push(EndState);
+                    self.stack.push(VecState(inner));
+                    self.stack.push(FieldState("inner"));
+                    Some(Ok(de::StructStart("Outer", 1)))
+                }
+                Some(InnerState(Inner { a: (), b, c })) => {
+                    self.stack.push(EndState);
+                    self.stack.push(MapState(c));
+                    self.stack.push(FieldState("c"));
+
+                    self.stack.push(UintState(b));
+                    self.stack.push(FieldState("b"));
+
+                    self.stack.push(NullState);
+                    self.stack.push(FieldState("a"));
+                    Some(Ok(de::StructStart("Inner", 3)))
+                }
+                Some(FieldState(name)) => Some(Ok(de::Str(name))),
+                Some(VecState(value)) => {
+                    self.stack.push(EndState);
+                    let len = value.len();
+                    for inner in value.move_iter().rev() {
+                        self.stack.push(InnerState(inner));
+                    }
+                    Some(Ok(de::SeqStart(len)))
+                }
+                Some(MapState(value)) => {
+                    self.stack.push(EndState);
+                    let len = value.len();
+                    for (key, value) in value.move_iter() {
+                        match value {
+                            Some(c) => {
+                                self.stack.push(CharState(c));
+                                self.stack.push(OptionState(true));
+                            }
+                            None => {
+                                self.stack.push(OptionState(false));
+                            }
+                        }
+                        self.stack.push(StringState(key));
+                    }
+                    Some(Ok(de::MapStart(len)))
+                }
+                Some(TupleState(len)) => Some(Ok(de::TupleStart(len))),
+                Some(NullState) => Some(Ok(de::Null)),
+                Some(UintState(x)) => Some(Ok(de::Uint(x))),
+                Some(CharState(x)) => Some(Ok(de::Char(x))),
+                Some(StringState(x)) => Some(Ok(de::String(x))),
+                Some(OptionState(x)) => Some(Ok(de::Option(x))),
+                Some(EndState) => {
+                    Some(Ok(de::End))
+                }
+                None => None,
+            }
+        }
+    }
+
+    impl de::Deserializer<Error> for OuterDeserializer {
+        #[inline]
+        fn end_of_stream_error(&mut self) -> Error {
+            EndOfStream
+        }
+
+        #[inline]
+        fn syntax_error(&mut self, _token: de::Token, _expected: &[de::TokenKind]) -> Error {
+            SyntaxError
+        }
+
+        #[inline]
+        fn unexpected_name_error(&mut self, _token: de::Token) -> Error {
+            SyntaxError
+        }
+
+        #[inline]
+        fn conversion_error(&mut self, _token: de::Token) -> Error {
+            SyntaxError
+        }
+
+        #[inline]
+        fn missing_field<
+            T: de::Deserializable<OuterDeserializer, Error>
+        >(&mut self, _field: &'static str) -> Result<T, Error> {
+            Err(SyntaxError)
+        }
+    }
+}
+
+#[bench]
+fn bench_decoder_0_0(b: &mut Bencher) {
+    b.iter(|| {
+        let mut map = HashMap::new();
+        map.insert("abc".to_string(), Some('c'));
+
+        let outer = Outer {
+            inner: vec!(),
+        };
+
+        let mut d = decoder::OuterDecoder::new(outer.clone());
+        let value: Outer = Decodable::decode(&mut d).unwrap();
+
+        assert_eq!(value, outer);
+    })
+}
+
+#[bench]
+fn bench_decoder_1_0(b: &mut Bencher) {
+    b.iter(|| {
+        let map = HashMap::new();
+
+        let outer = Outer {
+            inner: vec!(
+                Inner {
+                    a: (),
+                    b: 5,
+                    c: map,
+                },
+            )
+        };
+
+        let mut d = decoder::OuterDecoder::new(outer.clone());
+        let value: Outer = Decodable::decode(&mut d).unwrap();
+
+        assert_eq!(value, outer);
+    })
+}
+
+#[bench]
+fn bench_decoder_1_5(b: &mut Bencher) {
+    b.iter(|| {
+        let mut map = HashMap::new();
+        map.insert("1".to_string(), Some('a'));
+        map.insert("2".to_string(), None);
+        map.insert("3".to_string(), Some('b'));
+        map.insert("4".to_string(), None);
+        map.insert("5".to_string(), Some('c'));
+
+        let outer = Outer {
+            inner: vec!(
+                Inner {
+                    a: (),
+                    b: 5,
+                    c: map,
+                },
+            )
+        };
+
+        let mut d = decoder::OuterDecoder::new(outer.clone());
+        let value: Outer = Decodable::decode(&mut d).unwrap();
+
+        assert_eq!(value, outer);
+    })
+}
+
+#[bench]
+fn bench_deserializer_0_0(b: &mut Bencher) {
+    b.iter(|| {
+        let mut map = HashMap::new();
+        map.insert("abc".to_string(), Some('c'));
+
+        let outer = Outer {
+            inner: vec!(),
+        };
+
+        let mut d = deserializer::OuterDeserializer::new(outer.clone());
+        let value: Outer = Deserializable::deserialize(&mut d).unwrap();
+
+        assert_eq!(value, outer);
+    })
+}
+
+#[bench]
+fn bench_deserializer_1_0(b: &mut Bencher) {
+    b.iter(|| {
+        let map = HashMap::new();
+
+        let outer = Outer {
+            inner: vec!(
+                Inner {
+                    a: (),
+                    b: 5,
+                    c: map,
+                },
+            )
+        };
+
+        let mut d = deserializer::OuterDeserializer::new(outer.clone());
+        let value: Outer = Deserializable::deserialize(&mut d).unwrap();
+
+        assert_eq!(value, outer);
+    })
+}
+
+#[bench]
+fn bench_deserializer_1_5(b: &mut Bencher) {
+    b.iter(|| {
+        let mut map = HashMap::new();
+        map.insert("1".to_string(), Some('a'));
+        map.insert("2".to_string(), None);
+        map.insert("3".to_string(), Some('b'));
+        map.insert("4".to_string(), None);
+        map.insert("5".to_string(), Some('c'));
+
+        let outer = Outer {
+            inner: vec!(
+                Inner {
+                    a: (),
+                    b: 5,
+                    c: map,
+                },
+            )
+        };
+
+        let mut d = deserializer::OuterDeserializer::new(outer.clone());
+        let value: Outer = Deserializable::deserialize(&mut d).unwrap();
+
+        assert_eq!(value, outer);
+    })
+}