peep 0.6 → 0.7

data.tar.gz.sig

@@ -1,2 +1,2 @@
-=��f����Mq�j�g
-�����`mo@�$F�+�ck-��8��u'm���I5��c�N�
+�~��S��
+n�����Y�s�s�0ad@�h*�<�ԟ��PR�"8��K��2�wZѠmy�JZ�@,��`��qV���ލ��:H)!I�/����Ą��;�)3�@��������(yR,����]݂<��
��@�I�z:cP�r�o:2S�\F=̈́�5F�7�2ٍ]���!}`:R��E�-����V���1L�7N{�nS�t���F���0�H��

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v0.7. Memcached 1.4.5 compatibility.
+
 v0.6. Memcached 1.2.8 compatibility.
 
 v0.5. First release.

data/README

@@ -17,7 +17,7 @@ x86 Linux is required.
 
 You need {memcached}[http://www.danga.com/memcached/] compiled with debugging symbols:
 
-  CFLAGS='-g' ./configure --enable-threads
+  CFLAGS='-g' ./configure 
   make
   sudo make install
 

data/bin/peep

@@ -5,7 +5,7 @@ require "rubygems"
 require "peep"
 
 pretty = true
-format = "%10s |%10s |%8s |%8s |%5s |%6s |%5s |%75s |%6s |%7s\n"
+format = "%10s |%10s |%8s |%8s |%11s |%6s |%5s |%75s |%6s |%7s\n"
 
 if ARGV.first == '--ugly'
   pretty = false

data/ext/ptrace.c

@@ -5,6 +5,7 @@
 #include <sys/user.h>
 #include <sys/ptrace.h>
 #include <linux/ptrace.h>
+#include <stdbool.h>
 
 #include "ruby.h"
 #include "rubyio.h"
@@ -60,8 +61,6 @@ static VALUE stats_offsets () {
   STATS_(get_hits);
   STATS_(get_misses);  
   STATS_(started);  
-  STATS_(bytes_read);
-  STATS_(bytes_written);
   
   rb_hash_freeze(p_hash);
   return p_hash;

data/lib/peep/peep.rb

@@ -36,7 +36,7 @@ module Peep
     def init_addresses
       @addresses = {}
       IO.popen("gdb -q memcached #{pid}", "w+") do |gdb|
-        %w(primary_hashtable hash_items hashpower stats settings).each do | key|
+        %w(primary_hashtable hash_items hashpower stats settings process_started).each do | key|
           gdb.puts "p &#{key}"
           1 while (line = gdb.gets) !~ /\(gdb\)/
           @addresses[key] = line.split.last.hex
@@ -70,7 +70,8 @@ module Peep
         {
           'hashtable' => read_long(addresses['primary_hashtable']),
           'hash_items' => read_long(addresses['hash_items']),
-          'hashpower' => read_int(addresses['hashpower'])
+          'hashpower' => read_int(addresses['hashpower']),
+	      'process_started' => read_long(addresses['process_started'])
         }
       end
     end
@@ -105,9 +106,13 @@ module Peep
     end
 
     IT_FLAGS = {
-      1 => "link",
-      2 => "del",
-      4 => "slab"
+      1 => "LINKED",
+      2 => "CAS",
+      3 => "LINKED CAS",
+      4 => "SLABBED",
+      5 => "LINKED SLABBED",
+      6 => "SLABBED CAS",
+      7 => "LINKED SLABBED CAS"
     }
 
     HEADER = ['time', 'exptime', 'nbytes', 'nsuffix', 'it_f', 'clsid', 'nkey', 'key', 'exprd', 'flushd']
@@ -115,7 +120,7 @@ module Peep
     def items
       basics
 
-      now = Time.now.to_i - stats['started']
+      now = Time.now.to_i - basics['process_started']
       flushed = settings['oldest_live']
       items = []
 
@@ -131,10 +136,10 @@ module Peep
               exptime = read_int(bucket + ITEM_OFFSETS['exptime']),
               read_int(bucket + ITEM_OFFSETS['nbytes']),
               read_uint8(bucket + ITEM_OFFSETS['nsuffix']),
-              IT_FLAGS[read_uint8(bucket + ITEM_OFFSETS['it_flags'])],
+              IT_FLAGS[it_flags = read_uint8(bucket + ITEM_OFFSETS['it_flags'])],
               read_uint8(bucket + ITEM_OFFSETS['slabs_clsid']),
               nkey = read_uint8(bucket + ITEM_OFFSETS['nkey']),
-              read_bytes(bucket + ITEM_OFFSETS['end'], nkey),
+              read_bytes(bucket + ITEM_OFFSETS['end'] + (it_flags & 2 ? 8 : 0), nkey),
 
               !(exptime.zero? or now < exptime), # expired?
               !(flushed.zero? or flushed < time) # flushed?

data/peep.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{peep}
-  s.version = "0.6"
+  s.version = "0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
   s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
-  s.date = %q{2009-11-18}
+  s.date = %q{2011-02-16}
   s.default_executable = %q{peep}
   s.description = %q{A heap inspector for live memcached instances.}
   s.email = %q{}
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Peep", "--main", "README"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = %q{fauna}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.signing_key = %q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-private_key.pem}
   s.summary = %q{A heap inspector for live memcached instances.}
 
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: peep
 version: !ruby/object:Gem::Version 
-  version: "0.6"
+  hash: 5
+  prerelease: false
+  segments: 
+  - 0
+  - 7
+  version: "0.7"
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,7 +35,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2009-11-18 00:00:00 -08:00
+date: 2011-02-16 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -75,21 +80,28 @@ require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 11
+      segments: 
+      - 1
+      - 2
       version: "1.2"
-  version: 
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A heap inspector for live memcached instances.

metadata.gz.sig

@@ -1,2 +1,6 @@
-vYV�"mw����*/,�;7��;�ǎ�vΧ%�̜G�������Zň�.�p��u,$��� ^�;�2c+��Rl%7��:�5���8������k1O���e�on:AGb�5%�Y��(
-�H�)5�'�'frpnۀ
+����h���XD녞۫��Oe�(e�i�k��a���R��KD`�Ѓ��Ϗ�+�7���
+�49�'j�w9�
+P,�6-͓��Y	���~��=Y�UMFalB��bb��8���ߔ��<��E���Ul0��l���6�)}J���
+'�D�0٢�|#�<��mj�!S����|r谄�z0\x\�_���
+�,�!]꼳�/�ƥ4F1w3����љ~�P��'Md(J;�ܼ��%�
+�]��%�~XDnȽ�$