Remove log-events

Author: nox

.travis.yml

@@ -9,10 +9,6 @@ os:
   - linux
 script:
   - cargo build
-  - cargo test
-  - cargo test --features log-events
   - "if [ $TRAVIS_RUST_VERSION = nightly ]; then cargo test --features unstable; fi"
   - cargo test
   - "cd string-cache-codegen/ && cargo build && cd .."
-  - "cd examples/event-log/ && cargo build && cd ../.."
-  - "cd examples/summarize-events/ && cargo build && cd ../.."

Cargo.toml

@@ -1,5 +1,4 @@
 [package]
-
 name = "string_cache"
 version = "0.7.4"  # Also update README.md when making a semver-breaking change
 authors = [ "The Servo Project Developers" ]
@@ -19,11 +18,6 @@ build = "build.rs"
 name = "string_cache"
 
 [features]
-
-# Enable event logging for generating benchmark traces.
-# See examples/event-log.
-log-events = []
-
 # Use unstable features to optimize space and time (memory and CPU usage).
 unstable = []
 

examples/event-log/Cargo.toml

@@ -29,12 +29,6 @@ use shared::{STATIC_TAG, INLINE_TAG, DYNAMIC_TAG, TAG_MASK, MAX_INLINE_LEN, STAT
              ENTRY_ALIGNMENT, pack_static};
 use self::UnpackedAtom::{Dynamic, Inline, Static};
 
-#[cfg(feature = "log-events")]
-use event::Event;
-
-#[cfg(not(feature = "log-events"))]
-macro_rules! log (($e:expr) => (()));
-
 const NB_BUCKETS: usize = 1 << 12;  // 4096
 const BUCKET_MASK: u64 = (1 << 12) - 1;
 
@@ -101,16 +95,10 @@ impl StringCache {
         }
         debug_assert!(mem::align_of::<StringCacheEntry>() >= ENTRY_ALIGNMENT);
         let string = string.into_owned();
-        let _string_clone = if cfg!(feature = "log-events") {
-            string.clone()
-        } else {
-            "".to_owned()
-        };
         let mut entry = Box::new(StringCacheEntry::new(
             self.buckets[bucket_index].take(), hash, string));
         let ptr: *mut StringCacheEntry = &mut *entry;
         self.buckets[bucket_index] = Some(entry);
-        log!(Event::Insert(ptr as u64, _string_clone));
 
         ptr
     }
@@ -137,8 +125,6 @@ impl StringCache {
             }
             current = unsafe { &mut (*entry_ptr).next_in_bucket };
         }
-
-        log!(Event::Remove(key));
     }
 }
 
@@ -355,7 +341,6 @@ impl<'a, Static: StaticAtomSet> From<Cow<'a, str>> for Atom<Static> {
         };
 
         let data = unsafe { unpacked.pack() };
-        log!(Event::Intern(data));
         Atom { unsafe_data: data, phantom: PhantomData }
     }
 }

examples/event-log/README.md

@@ -118,10 +118,6 @@ extern crate string_cache_shared as shared;
 
 pub use atom::{Atom, StaticAtomSet, PhfStrSet, EmptyStaticAtomSet, DefaultAtom};
 
-#[cfg(feature = "log-events")]
-#[macro_use]
-pub mod event;
-
 pub mod atom;
 
 // Make test_atom! macro work in this crate.