memcached 1.0.7 → 1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (19) hide show
  1. data.tar.gz.sig +0 -0
  2. data/BENCHMARKS +120 -112
  3. data/CHANGELOG +2 -0
  4. data/Manifest +1 -2
  5. data/ext/extconf-make.rb +25 -0
  6. data/ext/extconf.rb +4 -7
  7. data/ext/rlibmemcached.i +1 -1
  8. data/ext/rlibmemcached_wrap.c +137 -126
  9. data/lib/memcached.rb +0 -1
  10. data/lib/memcached/memcached.rb +15 -15
  11. data/memcached.gemspec +2 -2
  12. data/test/profile/benchmark.rb +49 -38
  13. data/test/setup.rb +6 -6
  14. data/test/test_helper.rb +5 -2
  15. data/test/unit/memcached_experimental_test.rb +0 -3
  16. data/test/unit/memcached_test.rb +7 -6
  17. metadata +5 -6
  18. metadata.gz.sig +0 -0
  19. data/lib/memcached/integer.rb +0 -6
data.tar.gz.sig CHANGED
Binary file
data/BENCHMARKS CHANGED
@@ -1,5 +1,5 @@
1
1
 
2
- Here are some benchmarks for various architectures and operating systems.
2
+ Here are some benchmark results.
3
3
 
4
4
  You can easily run your own benchmarks, as long as you have memcached itself on your system:
5
5
  $ ruby -e 'system("ruby #{File.dirname(`gem which memcached`.split("\n").
@@ -7,122 +7,130 @@ You can easily run your own benchmarks, as long as you have memcached itself on
7
7
 
8
8
  == x86-64 OS X
9
9
 
10
- These benchmarks were run on a 64-bit multicore Linux machine, with memcached 1.4.4:
10
+ These benchmarks were run on a 64-bit OS X machine, with memcached 1.4.5:
11
11
 
12
- Darwin amber.local 9.8.0 Darwin Kernel Version 9.8.0: Wed Jul 15 16:55:01 PDT
13
- 2009; root:xnu-1228.15.4~1/RELEASE_I386 i386
14
- Ruby 1.9.2p0
15
- Loaded memcached 1
12
+ Darwin amber.local 10.6.0 Darwin Kernel Version 10.6.0: Wed Nov 10 18:13:17
13
+ PST 2010; root:xnu-1504.9.26~3/RELEASE_I386 i386
14
+ ruby 1.8.7 (2010-04-19 patchlevel 253) [i686-darwin10.4.0], MBARI 0x6770,
15
+ Ruby Enterprise Edition 2010.02
16
+ RUBY_HEAP_FREE_MIN=4096
17
+ RUBY_HEAP_MIN_SLOTS=500000
18
+ RUBY_HEAP_SLOTS_INCREMENT=250000
19
+ RUBY_GC_MALLOC_LIMIT=50000000
20
+ RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
21
+ RUBY_VERSION=ree-1.8.7-2010.02
22
+ Ruby 1.8.7p253
23
+ Loaded memcached 1.1
16
24
  Loaded remix-stash 1.1.3
17
25
  Loaded memcache-client 1.8.5
18
- Loaded dalli 0.9.7
26
+ Loaded kgio 2.0.0
27
+ Loaded dalli 1.0.2
19
28
  Loops is 20000
20
29
  Stack depth is 0
21
- Small value size is: 19 bytes
22
- Large value size is: 4189 bytes
30
+ Small value size is: 13 bytes
31
+ Large value size is: 4158 bytes
23
32
 
24
33
  user system total real
25
- set: dalli:bin 5.510000 1.440000 6.950000 ( 7.097051)
26
- set: libm:ascii 0.570000 1.010000 1.580000 ( 4.001999)
27
- set: libm:ascii:pipeline 0.160000 0.010000 0.170000 ( 0.185296)
28
- set: libm:ascii:udp 0.440000 0.550000 0.990000 ( 1.924700)
29
- set: libm:bin 0.480000 0.990000 1.470000 ( 3.606949)
30
- set: libm:bin:buffer 0.140000 0.110000 0.250000 ( 0.792182)
31
- set: mclient:ascii 7.700000 3.280000 10.980000 ( 11.116606)
32
- set: stash:bin 2.590000 1.140000 3.730000 ( 6.451502)
33
-
34
- get: dalli:bin 6.000000 1.610000 7.610000 ( 7.863815)
35
- get: libm:ascii 0.690000 1.050000 1.740000 ( 3.900660)
36
- get: libm:ascii:pipeline 0.790000 1.310000 2.100000 ( 4.115793)
37
- get: libm:ascii:udp 0.570000 0.550000 1.120000 ( 1.974468)
38
- get: libm:bin 0.560000 1.000000 1.560000 ( 3.400204)
39
- get: libm:bin:buffer 0.660000 1.340000 2.000000 ( 4.013932)
40
- get: mclient:ascii 8.930000 3.370000 12.300000 ( 12.457570)
41
- get: stash:bin 2.400000 1.300000 3.700000 ( 5.831002)
42
-
43
- get-multi: dalli:bin 7.260000 2.740000 10.000000 ( 10.315224)
44
- get-multi: libm:ascii 0.770000 0.630000 1.400000 ( 2.316304)
45
- get-multi: libm:ascii:pipeline 0.780000 0.630000 1.410000 ( 2.295434)
46
- get-multi: libm:ascii:udp 0.730000 0.480000 1.210000 ( 1.629404)
47
- get-multi: libm:bin 0.770000 0.920000 1.690000 ( 2.840419)
48
- get-multi: libm:bin:buffer 0.810000 0.980000 1.790000 ( 3.101011)
49
-
50
- append: dalli:bin 5.540000 1.810000 7.350000 ( 9.444572)
51
- append: libm:ascii 0.600000 1.060000 1.660000 ( 6.192075)
52
- append: libm:ascii:pipeline 0.190000 0.030000 0.220000 ( 9.282220)
53
- append: libm:ascii:udp 0.510000 0.590000 1.100000 ( 4.845760)
54
- append: libm:bin 0.530000 1.030000 1.560000 ( 12.244152)
55
- append: libm:bin:buffer 0.800000 1.470000 2.270000 ( 20.126558)
56
- append: mclient:ascii 7.320000 3.380000 10.700000 ( 16.757586)
57
-
58
- prepend: dalli:bin 7.060000 1.920000 8.980000 ( 13.621610)
59
- prepend: libm:ascii 0.870000 1.150000 2.020000 ( 22.071470)
60
- prepend: libm:ascii:pipeline 0.180000 0.010000 0.190000 ( 0.214543)
61
- prepend: libm:ascii:udp 0.570000 0.630000 1.200000 ( 15.165584)
62
- prepend: libm:bin 1.140000 1.030000 2.170000 ( 5.204032)
63
- prepend: libm:bin:buffer 1.230000 1.310000 2.540000 ( 5.545043)
64
- prepend: mclient:ascii 6.990000 3.130000 10.120000 ( 11.576000)
65
-
66
- delete: dalli:bin 5.270000 1.700000 6.970000 ( 7.506385)
67
- delete: libm:ascii 1.150000 1.030000 2.180000 ( 4.514493)
68
- delete: libm:ascii:pipeline 0.290000 0.350000 0.640000 ( 0.718225)
69
- delete: libm:ascii:udp 1.060000 0.660000 1.720000 ( 3.443370)
70
- delete: libm:bin 1.080000 1.020000 2.100000 ( 4.410147)
71
- delete: libm:bin:buffer 0.240000 0.350000 0.590000 ( 1.127925)
72
- delete: mclient:ascii 7.690000 3.320000 11.010000 ( 11.251595)
73
-
74
- get-missing: dalli:bin 5.540000 1.700000 7.240000 ( 7.350109)
75
- get-missing: libm:ascii 1.190000 1.020000 2.210000 ( 4.435602)
76
- get-missing: libm:ascii:pipeline 1.280000 1.410000 2.690000 ( 4.689176)
77
- get-missing: libm:ascii:udp 1.080000 0.650000 1.730000 ( 3.310339)
78
- get-missing: libm:bin 1.160000 1.030000 2.190000 ( 4.484304)
79
- get-missing: libm:bin:buffer 1.270000 1.400000 2.670000 ( 4.744352)
80
- get-missing: mclient:ascii 7.790000 3.330000 11.120000 ( 11.227906)
81
- get-missing: stash:bin 2.340000 1.310000 3.650000 ( 5.711464)
82
-
83
- append-missing: dalli:bin 7.750000 1.870000 9.620000 ( 9.838412)
84
- append-missing: libm:ascii 1.240000 1.050000 2.290000 ( 5.272057)
85
- append-missing: libm:ascii:pipeline 0.170000 0.010000 0.180000 ( 0.185741)
86
- append-missing: libm:ascii:udp 1.120000 0.670000 1.790000 ( 3.965537)
87
- append-missing: libm:bin 1.140000 1.020000 2.160000 ( 4.671309)
88
- append-missing: libm:bin:buffer 1.240000 1.400000 2.640000 ( 4.976723)
89
- append-missing: mclient:ascii 7.870000 3.310000 11.180000 ( 11.308514)
90
-
91
- prepend-missing: dalli:bin 7.740000 1.860000 9.600000 ( 9.746965)
92
- prepend-missing: libm:ascii 1.240000 1.040000 2.280000 ( 5.285512)
93
- prepend-missing: libm:ascii:pipeline 0.170000 0.010000 0.180000 ( 0.191364)
94
- prepend-missing: libm:ascii:udp 1.130000 0.670000 1.800000 ( 3.937638)
95
- prepend-missing: libm:bin 1.130000 1.020000 2.150000 ( 4.678974)
96
- prepend-missing: libm:bin:buffer 1.240000 1.420000 2.660000 ( 4.958552)
97
- prepend-missing: mclient:ascii 7.900000 3.300000 11.200000 ( 11.300894)
98
-
99
- set-large: dalli:bin 6.160000 1.600000 7.760000 ( 7.925181)
100
- set-large: libm:ascii 0.610000 1.140000 1.750000 ( 4.520586)
101
- set-large: libm:ascii:pipeline 0.330000 0.300000 0.630000 ( 0.795952)
102
- set-large: libm:ascii:udp 0.500000 0.630000 1.130000 ( 2.941319)
103
- set-large: libm:bin 0.510000 1.060000 1.570000 ( 4.005443)
104
- set-large: libm:bin:buffer 0.290000 0.440000 0.730000 ( 1.507181)
105
- set-large: mclient:ascii 8.170000 3.470000 11.640000 ( 11.992057)
106
- set-large: stash:bin 3.800000 1.150000 4.950000 ( 7.632398)
107
-
108
- get-large: dalli:bin 12.590000 1.930000 14.520000 ( 14.909260)
109
- get-large: libm:ascii 0.950000 1.180000 2.130000 ( 4.416920)
110
- get-large: libm:ascii:pipeline 1.020000 1.490000 2.510000 ( 5.031823)
111
- get-large: libm:ascii:udp 0.830000 0.730000 1.560000 ( 2.412008)
112
- get-large: libm:bin 0.830000 1.230000 2.060000 ( 4.123934)
113
- get-large: libm:bin:buffer 0.890000 1.420000 2.310000 ( 4.842008)
114
- get-large: mclient:ascii 10.220000 3.870000 14.090000 ( 14.289412)
115
- get-large: stash:bin 2.470000 1.330000 3.800000 ( 5.877608)
116
-
117
- hash:default 0.330000 0.000000 0.330000 ( 0.327642)
118
- hash:md5 0.740000 0.000000 0.740000 ( 0.742601)
119
- hash:crc 0.410000 0.000000 0.410000 ( 0.409796)
120
- hash:fnv1_64 0.800000 0.000000 0.800000 ( 0.800292)
121
- hash:fnv1a_64 0.270000 0.000000 0.270000 ( 0.274037)
122
- hash:fnv1_32 0.260000 0.000000 0.260000 ( 0.260237)
123
- hash:fnv1a_32 0.270000 0.010000 0.280000 ( 0.272979)
124
- hash:hsieh 0.120000 0.000000 0.120000 ( 0.121117)
125
- hash:murmur 0.210000 0.000000 0.210000 ( 0.203083)
126
- hash:jenkins 0.240000 0.000000 0.240000 ( 0.245728)
127
- hash:none 0.120000 0.000000 0.120000 ( 0.121219)
34
+ set: dalli:bin 4.260000 1.390000 5.650000 ( 7.781403)
35
+ set: libm:ascii 0.620000 1.000000 1.620000 ( 3.850559)
36
+ set: libm:ascii:pipeline 0.250000 0.010000 0.260000 ( 0.257739)
37
+ set: libm:ascii:udp 0.540000 0.560000 1.100000 ( 2.628061)
38
+ set: libm:bin 0.500000 0.870000 1.370000 ( 3.304144)
39
+ set: libm:bin:buffer 0.270000 0.110000 0.380000 ( 0.868976)
40
+ set: mclient:ascii 7.090000 1.940000 9.030000 ( 9.799150)
41
+ set: stash:bin 2.660000 1.090000 3.750000 ( 6.359556)
42
+
43
+ get: dalli:bin 4.630000 1.510000 6.140000 ( 8.750410)
44
+ get: libm:ascii 0.750000 0.980000 1.730000 ( 4.106665)
45
+ get: libm:ascii:pipeline 0.790000 1.190000 1.980000 ( 4.097790)
46
+ get: libm:ascii:udp 0.710000 0.580000 1.290000 ( 3.024444)
47
+ get: libm:bin 0.640000 0.980000 1.620000 ( 3.675987)
48
+ get: libm:bin:buffer 0.660000 1.100000 1.760000 ( 4.125261)
49
+ get: mclient:ascii 8.570000 1.860000 10.430000 ( 11.258154)
50
+ get: stash:bin 2.320000 1.010000 3.330000 ( 5.785865)
51
+
52
+ get-multi: dalli:bin 7.900000 2.310000 10.210000 ( 11.062836)
53
+ get-multi: libm:ascii 0.830000 0.580000 1.410000 ( 2.314816)
54
+ get-multi: libm:ascii:pipeline 0.780000 0.590000 1.370000 ( 2.505246)
55
+ get-multi: libm:ascii:udp 0.820000 0.460000 1.280000 ( 1.778208)
56
+ get-multi: libm:bin 0.820000 0.750000 1.570000 ( 3.781036)
57
+ get-multi: libm:bin:buffer 0.820000 0.710000 1.530000 ( 3.197627)
58
+
59
+ append: dalli:bin 3.770000 1.260000 5.030000 ( 9.071970)
60
+ append: libm:ascii 0.660000 0.990000 1.650000 ( 5.801622)
61
+ append: libm:ascii:pipeline 0.270000 0.010000 0.280000 ( 0.875748)
62
+ append: libm:ascii:udp 0.570000 0.600000 1.170000 ( 4.486811)
63
+ append: libm:bin 0.540000 0.880000 1.420000 ( 5.101226)
64
+ append: libm:bin:buffer 0.560000 0.770000 1.330000 ( 2.742466)
65
+ append: mclient:ascii 7.410000 1.820000 9.230000 ( 11.881533)
66
+
67
+ prepend: dalli:bin 3.600000 1.190000 4.790000 ( 8.895472)
68
+ prepend: libm:ascii 0.670000 1.000000 1.670000 ( 5.946532)
69
+ prepend: libm:ascii:pipeline 0.280000 0.010000 0.290000 ( 0.766421)
70
+ prepend: libm:ascii:udp 0.640000 0.570000 1.210000 ( 4.405895)
71
+ prepend: libm:bin 0.540000 0.900000 1.440000 ( 4.795609)
72
+ prepend: libm:bin:buffer 0.490000 0.760000 1.250000 ( 2.440978)
73
+ prepend: mclient:ascii 7.130000 1.680000 8.810000 ( 11.276423)
74
+
75
+ delete: dalli:bin 3.830000 1.400000 5.230000 ( 7.029441)
76
+ delete: libm:ascii 1.340000 0.960000 2.300000 ( 4.673076)
77
+ delete: libm:ascii:pipeline 0.330000 0.340000 0.670000 ( 0.727365)
78
+ delete: libm:ascii:udp 1.260000 0.690000 1.950000 ( 3.978592)
79
+ delete: libm:bin 1.170000 0.950000 2.120000 ( 4.623145)
80
+ delete: libm:bin:buffer 0.270000 0.330000 0.600000 ( 1.233183)
81
+ delete: mclient:ascii 6.840000 1.590000 8.430000 ( 9.413134)
82
+
83
+ get-missing: dalli:bin 3.750000 1.360000 5.110000 ( 7.640075)
84
+ get-missing: libm:ascii 1.390000 0.960000 2.350000 ( 4.956339)
85
+ get-missing: libm:ascii:pipeline 1.460000 1.290000 2.750000 ( 5.100596)
86
+ get-missing: libm:ascii:udp 1.290000 0.660000 1.950000 ( 3.916012)
87
+ get-missing: libm:bin 1.370000 0.950000 2.320000 ( 4.699251)
88
+ get-missing: libm:bin:buffer 1.430000 1.250000 2.680000 ( 5.016395)
89
+ get-missing: mclient:ascii 7.030000 1.630000 8.660000 ( 10.143076)
90
+
91
+ append-missing: dalli:bin 3.870000 1.360000 5.230000 ( 7.454089)
92
+ append-missing: libm:ascii 1.430000 0.950000 2.380000 ( 5.313864)
93
+ append-missing: libm:ascii:pipeline 0.250000 0.010000 0.260000 ( 0.262928)
94
+ append-missing: libm:ascii:udp 1.330000 0.680000 2.010000 ( 4.366685)
95
+ append-missing: libm:bin 1.350000 0.940000 2.290000 ( 5.314118)
96
+ append-missing: mclient:ascii 6.510000 1.510000 8.020000 ( 10.445953)
97
+
98
+ prepend-missing: dalli:bin 3.930000 1.400000 5.330000 ( 7.723462)
99
+ prepend-missing: libm:ascii 1.440000 0.980000 2.420000 ( 5.013569)
100
+ prepend-missing: libm:ascii:pipeline 0.260000 0.010000 0.270000 ( 0.268678)
101
+ prepend-missing: libm:ascii:udp 1.370000 0.720000 2.090000 ( 4.132354)
102
+ prepend-missing: libm:bin 1.340000 0.930000 2.270000 ( 5.525098)
103
+ prepend-missing: mclient:ascii 7.030000 1.670000 8.700000 ( 9.769180)
104
+
105
+ set-large: dalli:bin 4.950000 1.670000 6.620000 ( 9.261310)
106
+ set-large: libm:ascii 0.670000 1.060000 1.730000 ( 4.484607)
107
+ set-large: libm:ascii:pipeline 0.400000 0.260000 0.660000 ( 0.879186)
108
+ set-large: libm:ascii:udp 0.620000 0.690000 1.310000 ( 4.016410)
109
+ set-large: libm:bin 0.540000 1.010000 1.550000 ( 3.763049)
110
+ set-large: libm:bin:buffer 0.370000 0.440000 0.810000 ( 1.543509)
111
+ set-large: mclient:ascii 7.570000 2.120000 9.690000 ( 10.677677)
112
+ set-large: stash:bin 3.950000 1.080000 5.030000 ( 7.506158)
113
+
114
+ get-large: dalli:bin 4.580000 1.370000 5.950000 ( 7.917984)
115
+ get-large: libm:ascii 0.740000 0.900000 1.640000 ( 3.994640)
116
+ get-large: libm:ascii:pipeline 0.800000 1.190000 1.990000 ( 4.067327)
117
+ get-large: libm:ascii:udp 0.750000 0.560000 1.310000 ( 2.875825)
118
+ get-large: libm:bin 0.630000 0.990000 1.620000 ( 3.536786)
119
+ get-large: libm:bin:buffer 0.690000 1.140000 1.830000 ( 3.937316)
120
+ get-large: mclient:ascii 8.840000 1.980000 10.820000 ( 11.897647)
121
+ get-large: stash:bin 2.450000 0.960000 3.410000 ( 5.595178)
122
+
123
+ hash:murmur 0.240000 0.000000 0.240000 ( 0.244843)
124
+ hash:md5 0.580000 0.000000 0.580000 ( 0.584214)
125
+ hash:fnv1a_64 0.360000 0.000000 0.360000 ( 0.382996)
126
+ hash:fnv1a_32 0.310000 0.010000 0.320000 ( 0.332762)
127
+ hash:jenkins 0.270000 0.000000 0.270000 ( 0.282539)
128
+ hash:default 0.380000 0.000000 0.380000 ( 0.387484)
129
+ hash:crc 0.390000 0.000000 0.390000 ( 0.388273)
130
+ hash:hsieh 0.210000 0.000000 0.210000 ( 0.208599)
131
+ hash:fnv1_32 0.310000 0.000000 0.310000 ( 0.314305)
132
+ hash:fnv1_64 0.430000 0.000000 0.430000 ( 0.425971)
133
+ hash:none 0.230000 0.000000 0.230000 ( 0.225403)
134
+
135
+
128
136
 
data/CHANGELOG CHANGED
@@ -1,3 +1,5 @@
1
+ v1.1. TTL interface requires Fixnums.
2
+
1
3
  v1.0.7. Fix build on BSD (Stew Mckinney). Fix build on Rubinius (brixen).
2
4
 
3
5
  v1.0.6. Make build step repeatable in the event of failure.
data/Manifest CHANGED
@@ -5,6 +5,7 @@ Manifest
5
5
  README
6
6
  Rakefile
7
7
  TODO
8
+ ext/extconf-make.rb
8
9
  ext/extconf.rb
9
10
  ext/libmemcached-0.32.tar.gz
10
11
  ext/libmemcached-2.patch
@@ -21,10 +22,8 @@ lib/memcached/auth.rb
21
22
  lib/memcached/behaviors.rb
22
23
  lib/memcached/exceptions.rb
23
24
  lib/memcached/experimental.rb
24
- lib/memcached/integer.rb
25
25
  lib/memcached/memcached.rb
26
26
  lib/memcached/rails.rb
27
- memcached.gemspec
28
27
  test/profile/benchmark.rb
29
28
  test/profile/profile.rb
30
29
  test/profile/valgrind.rb
data/ext/extconf-make.rb ADDED
@@ -0,0 +1,25 @@
1
+ require 'rbconfig'
2
+
3
+ $CXXFLAGS = ENV['CXXFLAGS']
4
+ $PATH = ENV['SOURCE_DIR']
5
+ $GMAKE_CMD = ENV['GMAKE_CMD']
6
+
7
+ HERE = ENV['HERE']
8
+
9
+ BSD = RbConfig::CONFIG['build_os'] =~ /^freebsd|^openbsd/
10
+
11
+ Dir.chdir(HERE)
12
+
13
+ old_dir = Dir.pwd
14
+
15
+ Dir.chdir($PATH)
16
+
17
+ system("cd .") if BSD #Fix for a "quirk" that BSD has..
18
+
19
+ puts(cmd = "#{$GMAKE_CMD} CXXFLAGS='#{$CXXFLAGS}' || true 2>&1")
20
+ raise "'#{cmd}' failed" unless system(cmd)
21
+
22
+ puts(cmd = "#{$GMAKE_CMD} install || true 2>&1")
23
+ raise "'#{cmd}' failed" unless system(cmd)
24
+
25
+ Dir.chdir(old_dir)
data/ext/extconf.rb CHANGED
@@ -90,13 +90,10 @@ end
90
90
  check_libmemcached
91
91
 
92
92
  if ENV['SWIG']
93
- if (`swig -version`=~ /2.0.1/)
94
- run("swig #{$defines} #{$includes} -ruby -autorename rlibmemcached.i", "Running SWIG.")
95
- run("sed -i '' 's/STR2CSTR/StringValuePtr/' rlibmemcached_wrap.c", "Patching SWIG output for Ruby 1.9.")
96
- run("sed -i '' 's/\"swig_runtime_data\"/\"SwigRuntimeData\"/' rlibmemcached_wrap.c", "Patching SWIG output for Ruby 1.9.")
97
- else
98
- raise "Swig 2.0.1 not found. Newer versions may not work."
99
- end
93
+ puts "WARNING: Swig 2.0.2 not found. Other versions may not work." if (`swig -version`!~ /2.0.2/)
94
+ run("swig #{$defines} #{$includes} -ruby -autorename rlibmemcached.i", "Running SWIG.")
95
+ run("sed -i '' 's/STR2CSTR/StringValuePtr/' rlibmemcached_wrap.c", "Patching SWIG output for Ruby 1.9.")
96
+ run("sed -i '' 's/\"swig_runtime_data\"/\"SwigRuntimeData\"/' rlibmemcached_wrap.c", "Patching SWIG output for Ruby 1.9.")
100
97
  end
101
98
 
102
99
  $CFLAGS << " -Os"
data/ext/rlibmemcached.i CHANGED
@@ -25,7 +25,7 @@
25
25
  %apply unsigned int { uint16_t };
26
26
  %apply unsigned int { uint32_t server_failure_counter };
27
27
  %apply unsigned int { uint32_t user_spec_len };
28
- %apply unsigned long { uint32_t flags, uint32_t offset, uint32_t weight };
28
+ %apply unsigned long { uint32_t flags, uint32_t offset, uint32_t weight, time_t expiration };
29
29
  %apply unsigned long long { uint64_t data, uint64_t cas };
30
30
 
31
31
  // Array of strings map for multiget
data/ext/rlibmemcached_wrap.c CHANGED
@@ -1,6 +1,6 @@
1
1
  /* ----------------------------------------------------------------------------
2
2
  * This file was automatically generated by SWIG (http://www.swig.org).
3
- * Version 2.0.1
3
+ * Version 2.0.2
4
4
  *
5
5
  * This file is not intended to be easily readable and contains a number of
6
6
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1819,11 +1819,10 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
1819
1819
  #define SWIGTYPE_p_p_char swig_types[27]
1820
1820
  #define SWIGTYPE_p_sasl_callback_t swig_types[28]
1821
1821
  #define SWIGTYPE_p_size_t swig_types[29]
1822
- #define SWIGTYPE_p_time_t swig_types[30]
1823
- #define SWIGTYPE_p_uint32_t swig_types[31]
1824
- #define SWIGTYPE_p_uint64_t swig_types[32]
1825
- static swig_type_info *swig_types[34];
1826
- static swig_module_info swig_module = {swig_types, 33, 0, 0, 0, 0};
1822
+ #define SWIGTYPE_p_uint32_t swig_types[30]
1823
+ #define SWIGTYPE_p_uint64_t swig_types[31]
1824
+ static swig_type_info *swig_types[33];
1825
+ static swig_module_info swig_module = {swig_types, 32, 0, 0, 0, 0};
1827
1826
  #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
1828
1827
  #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
1829
1828
 
@@ -1838,7 +1837,7 @@ static VALUE mRlibmemcached;
1838
1837
  #define SWIG_RUBY_THREAD_END_BLOCK
1839
1838
 
1840
1839
 
1841
- #define SWIGVERSION 0x020001
1840
+ #define SWIGVERSION 0x020002
1842
1841
  #define SWIG_VERSION SWIGVERSION
1843
1842
 
1844
1843
 
@@ -1942,7 +1941,7 @@ SWIG_ruby_failed(void)
1942
1941
  }
1943
1942
 
1944
1943
 
1945
- /*@SWIG:/opt/local/share/swig/2.0.1/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
1944
+ /*@SWIG:/opt/local/share/swig/2.0.2/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
1946
1945
  SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
1947
1946
  {
1948
1947
  VALUE obj = args[0];
@@ -2036,7 +2035,7 @@ SWIG_AsCharArray(VALUE obj, char *val, size_t size)
2036
2035
  }
2037
2036
 
2038
2037
 
2039
- /*@SWIG:/opt/local/share/swig/2.0.1/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
2038
+ /*@SWIG:/opt/local/share/swig/2.0.2/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
2040
2039
  SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
2041
2040
  {
2042
2041
  VALUE obj = args[0];
@@ -2095,7 +2094,7 @@ SWIG_From_unsigned_SS_short (unsigned short value)
2095
2094
  }
2096
2095
 
2097
2096
 
2098
- /*@SWIG:/opt/local/share/swig/2.0.1/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
2097
+ /*@SWIG:/opt/local/share/swig/2.0.2/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
2099
2098
  SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
2100
2099
  {
2101
2100
  VALUE obj = args[0];
@@ -2217,7 +2216,7 @@ SWIG_AsVal_unsigned_SS_int (VALUE obj, unsigned int *val)
2217
2216
  }
2218
2217
 
2219
2218
 
2220
- /*@SWIG:/opt/local/share/swig/2.0.1/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
2219
+ /*@SWIG:/opt/local/share/swig/2.0.2/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
2221
2220
  SWIGINTERN VALUE SWIG_AUX_NUM2ULL(VALUE *args)
2222
2221
  {
2223
2222
  VALUE obj = args[0];
@@ -6976,6 +6975,8 @@ _wrap_memcached_delete(int argc, VALUE *argv, VALUE self) {
6976
6975
  time_t arg4 ;
6977
6976
  void *argp1 = 0 ;
6978
6977
  int res1 = 0 ;
6978
+ unsigned long val4 ;
6979
+ int ecode4 = 0 ;
6979
6980
  memcached_return result;
6980
6981
  VALUE vresult = Qnil;
6981
6982
 
@@ -6991,12 +6992,11 @@ _wrap_memcached_delete(int argc, VALUE *argv, VALUE self) {
6991
6992
  arg2 = StringValuePtr(argv[1]);
6992
6993
  arg3 = (size_t) RSTRING_LEN(argv[1]);
6993
6994
  }
6994
- {
6995
- if (NIL_P(argv[2]))
6996
- arg4 = (time_t)-1;
6997
- else
6998
- arg4 = NUM2LONG(rb_funcall(argv[2], rb_intern("tv_sec"), 0));
6999
- }
6995
+ ecode4 = SWIG_AsVal_unsigned_SS_long(argv[2], &val4);
6996
+ if (!SWIG_IsOK(ecode4)) {
6997
+ SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "time_t","memcached_delete", 4, argv[2] ));
6998
+ }
6999
+ arg4 = (time_t)(val4);
7000
7000
  result = (memcached_return)memcached_delete(arg1,(char const *)arg2,arg3,arg4);
7001
7001
  vresult = SWIG_From_int((int)(result));
7002
7002
  return vresult;
@@ -7116,6 +7116,8 @@ _wrap_memcached_increment_with_initial(int argc, VALUE *argv, VALUE self) {
7116
7116
  int res4 = 0 ;
7117
7117
  void *argp5 ;
7118
7118
  int res5 = 0 ;
7119
+ unsigned long val6 ;
7120
+ int ecode6 = 0 ;
7119
7121
  uint64_t temp7 ;
7120
7122
  int res7 = SWIG_TMPOBJ ;
7121
7123
  memcached_return result;
@@ -7156,12 +7158,11 @@ _wrap_memcached_increment_with_initial(int argc, VALUE *argv, VALUE self) {
7156
7158
  arg5 = *((uint64_t *)(argp5));
7157
7159
  }
7158
7160
  }
7159
- {
7160
- if (NIL_P(argv[4]))
7161
- arg6 = (time_t)-1;
7162
- else
7163
- arg6 = NUM2LONG(rb_funcall(argv[4], rb_intern("tv_sec"), 0));
7164
- }
7161
+ ecode6 = SWIG_AsVal_unsigned_SS_long(argv[4], &val6);
7162
+ if (!SWIG_IsOK(ecode6)) {
7163
+ SWIG_exception_fail(SWIG_ArgError(ecode6), Ruby_Format_TypeError( "", "time_t","memcached_increment_with_initial", 6, argv[4] ));
7164
+ }
7165
+ arg6 = (time_t)(val6);
7165
7166
  result = (memcached_return)memcached_increment_with_initial(arg1,(char const *)arg2,arg3,arg4,arg5,arg6,arg7);
7166
7167
  vresult = SWIG_From_int((int)(result));
7167
7168
  if (SWIG_IsTmpObj(res7)) {
@@ -7191,6 +7192,8 @@ _wrap_memcached_decrement_with_initial(int argc, VALUE *argv, VALUE self) {
7191
7192
  int res4 = 0 ;
7192
7193
  void *argp5 ;
7193
7194
  int res5 = 0 ;
7195
+ unsigned long val6 ;
7196
+ int ecode6 = 0 ;
7194
7197
  uint64_t temp7 ;
7195
7198
  int res7 = SWIG_TMPOBJ ;
7196
7199
  memcached_return result;
@@ -7231,12 +7234,11 @@ _wrap_memcached_decrement_with_initial(int argc, VALUE *argv, VALUE self) {
7231
7234
  arg5 = *((uint64_t *)(argp5));
7232
7235
  }
7233
7236
  }
7234
- {
7235
- if (NIL_P(argv[4]))
7236
- arg6 = (time_t)-1;
7237
- else
7238
- arg6 = NUM2LONG(rb_funcall(argv[4], rb_intern("tv_sec"), 0));
7239
- }
7237
+ ecode6 = SWIG_AsVal_unsigned_SS_long(argv[4], &val6);
7238
+ if (!SWIG_IsOK(ecode6)) {
7239
+ SWIG_exception_fail(SWIG_ArgError(ecode6), Ruby_Format_TypeError( "", "time_t","memcached_decrement_with_initial", 6, argv[4] ));
7240
+ }
7241
+ arg6 = (time_t)(val6);
7240
7242
  result = (memcached_return)memcached_decrement_with_initial(arg1,(char const *)arg2,arg3,arg4,arg5,arg6,arg7);
7241
7243
  vresult = SWIG_From_int((int)(result));
7242
7244
  if (SWIG_IsTmpObj(res7)) {
@@ -7385,6 +7387,8 @@ _wrap_memcached_flush(int argc, VALUE *argv, VALUE self) {
7385
7387
  time_t arg2 ;
7386
7388
  void *argp1 = 0 ;
7387
7389
  int res1 = 0 ;
7390
+ unsigned long val2 ;
7391
+ int ecode2 = 0 ;
7388
7392
  memcached_return result;
7389
7393
  VALUE vresult = Qnil;
7390
7394
 
@@ -7396,12 +7400,11 @@ _wrap_memcached_flush(int argc, VALUE *argv, VALUE self) {
7396
7400
  SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "memcached_st *","memcached_flush", 1, argv[0] ));
7397
7401
  }
7398
7402
  arg1 = (memcached_st *)(argp1);
7399
- {
7400
- if (NIL_P(argv[1]))
7401
- arg2 = (time_t)-1;
7402
- else
7403
- arg2 = NUM2LONG(rb_funcall(argv[1], rb_intern("tv_sec"), 0));
7404
- }
7403
+ ecode2 = SWIG_AsVal_unsigned_SS_long(argv[1], &val2);
7404
+ if (!SWIG_IsOK(ecode2)) {
7405
+ SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "time_t","memcached_flush", 2, argv[1] ));
7406
+ }
7407
+ arg2 = (time_t)(val2);
7405
7408
  result = (memcached_return)memcached_flush(arg1,arg2);
7406
7409
  vresult = SWIG_From_int((int)(result));
7407
7410
  return vresult;
@@ -8256,6 +8259,8 @@ _wrap_memcached_delete_by_key(int argc, VALUE *argv, VALUE self) {
8256
8259
  time_t arg6 ;
8257
8260
  void *argp1 = 0 ;
8258
8261
  int res1 = 0 ;
8262
+ unsigned long val6 ;
8263
+ int ecode6 = 0 ;
8259
8264
  memcached_return result;
8260
8265
  VALUE vresult = Qnil;
8261
8266
 
@@ -8271,12 +8276,11 @@ _wrap_memcached_delete_by_key(int argc, VALUE *argv, VALUE self) {
8271
8276
  arg4 = arg2 = StringValuePtr(argv[1]);
8272
8277
  arg5 = arg3 = (size_t) RSTRING_LEN(argv[1]);
8273
8278
  }
8274
- {
8275
- if (NIL_P(argv[2]))
8276
- arg6 = (time_t)-1;
8277
- else
8278
- arg6 = NUM2LONG(rb_funcall(argv[2], rb_intern("tv_sec"), 0));
8279
- }
8279
+ ecode6 = SWIG_AsVal_unsigned_SS_long(argv[2], &val6);
8280
+ if (!SWIG_IsOK(ecode6)) {
8281
+ SWIG_exception_fail(SWIG_ArgError(ecode6), Ruby_Format_TypeError( "", "time_t","memcached_delete_by_key", 6, argv[2] ));
8282
+ }
8283
+ arg6 = (time_t)(val6);
8280
8284
  result = (memcached_return)memcached_delete_by_key(arg1,(char const *)arg2,arg3,(char const *)arg4,arg5,arg6);
8281
8285
  vresult = SWIG_From_int((int)(result));
8282
8286
  return vresult;
@@ -9213,6 +9217,8 @@ _wrap_memcached_set(int argc, VALUE *argv, VALUE self) {
9213
9217
  uint32_t arg7 ;
9214
9218
  void *argp1 = 0 ;
9215
9219
  int res1 = 0 ;
9220
+ unsigned long val6 ;
9221
+ int ecode6 = 0 ;
9216
9222
  unsigned long val7 ;
9217
9223
  int ecode7 = 0 ;
9218
9224
  memcached_return result;
@@ -9234,12 +9240,11 @@ _wrap_memcached_set(int argc, VALUE *argv, VALUE self) {
9234
9240
  arg4 = StringValuePtr(argv[2]);
9235
9241
  arg5 = (size_t) RSTRING_LEN(argv[2]);
9236
9242
  }
9237
- {
9238
- if (NIL_P(argv[3]))
9239
- arg6 = (time_t)-1;
9240
- else
9241
- arg6 = NUM2LONG(rb_funcall(argv[3], rb_intern("tv_sec"), 0));
9242
- }
9243
+ ecode6 = SWIG_AsVal_unsigned_SS_long(argv[3], &val6);
9244
+ if (!SWIG_IsOK(ecode6)) {
9245
+ SWIG_exception_fail(SWIG_ArgError(ecode6), Ruby_Format_TypeError( "", "time_t","memcached_set", 6, argv[3] ));
9246
+ }
9247
+ arg6 = (time_t)(val6);
9243
9248
  ecode7 = SWIG_AsVal_unsigned_SS_long(argv[4], &val7);
9244
9249
  if (!SWIG_IsOK(ecode7)) {
9245
9250
  SWIG_exception_fail(SWIG_ArgError(ecode7), Ruby_Format_TypeError( "", "uint32_t","memcached_set", 7, argv[4] ));
@@ -9264,6 +9269,8 @@ _wrap_memcached_add(int argc, VALUE *argv, VALUE self) {
9264
9269
  uint32_t arg7 ;
9265
9270
  void *argp1 = 0 ;
9266
9271
  int res1 = 0 ;
9272
+ unsigned long val6 ;
9273
+ int ecode6 = 0 ;
9267
9274
  unsigned long val7 ;
9268
9275
  int ecode7 = 0 ;
9269
9276
  memcached_return result;
@@ -9285,12 +9292,11 @@ _wrap_memcached_add(int argc, VALUE *argv, VALUE self) {
9285
9292
  arg4 = StringValuePtr(argv[2]);
9286
9293
  arg5 = (size_t) RSTRING_LEN(argv[2]);
9287
9294
  }
9288
- {
9289
- if (NIL_P(argv[3]))
9290
- arg6 = (time_t)-1;
9291
- else
9292
- arg6 = NUM2LONG(rb_funcall(argv[3], rb_intern("tv_sec"), 0));
9293
- }
9295
+ ecode6 = SWIG_AsVal_unsigned_SS_long(argv[3], &val6);
9296
+ if (!SWIG_IsOK(ecode6)) {
9297
+ SWIG_exception_fail(SWIG_ArgError(ecode6), Ruby_Format_TypeError( "", "time_t","memcached_add", 6, argv[3] ));
9298
+ }
9299
+ arg6 = (time_t)(val6);
9294
9300
  ecode7 = SWIG_AsVal_unsigned_SS_long(argv[4], &val7);
9295
9301
  if (!SWIG_IsOK(ecode7)) {
9296
9302
  SWIG_exception_fail(SWIG_ArgError(ecode7), Ruby_Format_TypeError( "", "uint32_t","memcached_add", 7, argv[4] ));
@@ -9315,6 +9321,8 @@ _wrap_memcached_replace(int argc, VALUE *argv, VALUE self) {
9315
9321
  uint32_t arg7 ;
9316
9322
  void *argp1 = 0 ;
9317
9323
  int res1 = 0 ;
9324
+ unsigned long val6 ;
9325
+ int ecode6 = 0 ;
9318
9326
  unsigned long val7 ;
9319
9327
  int ecode7 = 0 ;
9320
9328
  memcached_return result;
@@ -9336,12 +9344,11 @@ _wrap_memcached_replace(int argc, VALUE *argv, VALUE self) {
9336
9344
  arg4 = StringValuePtr(argv[2]);
9337
9345
  arg5 = (size_t) RSTRING_LEN(argv[2]);
9338
9346
  }
9339
- {
9340
- if (NIL_P(argv[3]))
9341
- arg6 = (time_t)-1;
9342
- else
9343
- arg6 = NUM2LONG(rb_funcall(argv[3], rb_intern("tv_sec"), 0));
9344
- }
9347
+ ecode6 = SWIG_AsVal_unsigned_SS_long(argv[3], &val6);
9348
+ if (!SWIG_IsOK(ecode6)) {
9349
+ SWIG_exception_fail(SWIG_ArgError(ecode6), Ruby_Format_TypeError( "", "time_t","memcached_replace", 6, argv[3] ));
9350
+ }
9351
+ arg6 = (time_t)(val6);
9345
9352
  ecode7 = SWIG_AsVal_unsigned_SS_long(argv[4], &val7);
9346
9353
  if (!SWIG_IsOK(ecode7)) {
9347
9354
  SWIG_exception_fail(SWIG_ArgError(ecode7), Ruby_Format_TypeError( "", "uint32_t","memcached_replace", 7, argv[4] ));
@@ -9366,6 +9373,8 @@ _wrap_memcached_append(int argc, VALUE *argv, VALUE self) {
9366
9373
  uint32_t arg7 ;
9367
9374
  void *argp1 = 0 ;
9368
9375
  int res1 = 0 ;
9376
+ unsigned long val6 ;
9377
+ int ecode6 = 0 ;
9369
9378
  unsigned long val7 ;
9370
9379
  int ecode7 = 0 ;
9371
9380
  memcached_return result;
@@ -9387,12 +9396,11 @@ _wrap_memcached_append(int argc, VALUE *argv, VALUE self) {
9387
9396
  arg4 = StringValuePtr(argv[2]);
9388
9397
  arg5 = (size_t) RSTRING_LEN(argv[2]);
9389
9398
  }
9390
- {
9391
- if (NIL_P(argv[3]))
9392
- arg6 = (time_t)-1;
9393
- else
9394
- arg6 = NUM2LONG(rb_funcall(argv[3], rb_intern("tv_sec"), 0));
9395
- }
9399
+ ecode6 = SWIG_AsVal_unsigned_SS_long(argv[3], &val6);
9400
+ if (!SWIG_IsOK(ecode6)) {
9401
+ SWIG_exception_fail(SWIG_ArgError(ecode6), Ruby_Format_TypeError( "", "time_t","memcached_append", 6, argv[3] ));
9402
+ }
9403
+ arg6 = (time_t)(val6);
9396
9404
  ecode7 = SWIG_AsVal_unsigned_SS_long(argv[4], &val7);
9397
9405
  if (!SWIG_IsOK(ecode7)) {
9398
9406
  SWIG_exception_fail(SWIG_ArgError(ecode7), Ruby_Format_TypeError( "", "uint32_t","memcached_append", 7, argv[4] ));
@@ -9417,6 +9425,8 @@ _wrap_memcached_prepend(int argc, VALUE *argv, VALUE self) {
9417
9425
  uint32_t arg7 ;
9418
9426
  void *argp1 = 0 ;
9419
9427
  int res1 = 0 ;
9428
+ unsigned long val6 ;
9429
+ int ecode6 = 0 ;
9420
9430
  unsigned long val7 ;
9421
9431
  int ecode7 = 0 ;
9422
9432
  memcached_return result;
@@ -9438,12 +9448,11 @@ _wrap_memcached_prepend(int argc, VALUE *argv, VALUE self) {
9438
9448
  arg4 = StringValuePtr(argv[2]);
9439
9449
  arg5 = (size_t) RSTRING_LEN(argv[2]);
9440
9450
  }
9441
- {
9442
- if (NIL_P(argv[3]))
9443
- arg6 = (time_t)-1;
9444
- else
9445
- arg6 = NUM2LONG(rb_funcall(argv[3], rb_intern("tv_sec"), 0));
9446
- }
9451
+ ecode6 = SWIG_AsVal_unsigned_SS_long(argv[3], &val6);
9452
+ if (!SWIG_IsOK(ecode6)) {
9453
+ SWIG_exception_fail(SWIG_ArgError(ecode6), Ruby_Format_TypeError( "", "time_t","memcached_prepend", 6, argv[3] ));
9454
+ }
9455
+ arg6 = (time_t)(val6);
9447
9456
  ecode7 = SWIG_AsVal_unsigned_SS_long(argv[4], &val7);
9448
9457
  if (!SWIG_IsOK(ecode7)) {
9449
9458
  SWIG_exception_fail(SWIG_ArgError(ecode7), Ruby_Format_TypeError( "", "uint32_t","memcached_prepend", 7, argv[4] ));
@@ -9469,6 +9478,8 @@ _wrap_memcached_cas(int argc, VALUE *argv, VALUE self) {
9469
9478
  uint64_t arg8 ;
9470
9479
  void *argp1 = 0 ;
9471
9480
  int res1 = 0 ;
9481
+ unsigned long val6 ;
9482
+ int ecode6 = 0 ;
9472
9483
  unsigned long val7 ;
9473
9484
  int ecode7 = 0 ;
9474
9485
  unsigned long long val8 ;
@@ -9492,12 +9503,11 @@ _wrap_memcached_cas(int argc, VALUE *argv, VALUE self) {
9492
9503
  arg4 = StringValuePtr(argv[2]);
9493
9504
  arg5 = (size_t) RSTRING_LEN(argv[2]);
9494
9505
  }
9495
- {
9496
- if (NIL_P(argv[3]))
9497
- arg6 = (time_t)-1;
9498
- else
9499
- arg6 = NUM2LONG(rb_funcall(argv[3], rb_intern("tv_sec"), 0));
9500
- }
9506
+ ecode6 = SWIG_AsVal_unsigned_SS_long(argv[3], &val6);
9507
+ if (!SWIG_IsOK(ecode6)) {
9508
+ SWIG_exception_fail(SWIG_ArgError(ecode6), Ruby_Format_TypeError( "", "time_t","memcached_cas", 6, argv[3] ));
9509
+ }
9510
+ arg6 = (time_t)(val6);
9501
9511
  ecode7 = SWIG_AsVal_unsigned_SS_long(argv[4], &val7);
9502
9512
  if (!SWIG_IsOK(ecode7)) {
9503
9513
  SWIG_exception_fail(SWIG_ArgError(ecode7), Ruby_Format_TypeError( "", "uint32_t","memcached_cas", 7, argv[4] ));
@@ -9529,6 +9539,8 @@ _wrap_memcached_set_by_key(int argc, VALUE *argv, VALUE self) {
9529
9539
  uint32_t arg9 ;
9530
9540
  void *argp1 = 0 ;
9531
9541
  int res1 = 0 ;
9542
+ unsigned long val8 ;
9543
+ int ecode8 = 0 ;
9532
9544
  unsigned long val9 ;
9533
9545
  int ecode9 = 0 ;
9534
9546
  memcached_return result;
@@ -9550,12 +9562,11 @@ _wrap_memcached_set_by_key(int argc, VALUE *argv, VALUE self) {
9550
9562
  arg6 = StringValuePtr(argv[2]);
9551
9563
  arg7 = (size_t) RSTRING_LEN(argv[2]);
9552
9564
  }
9553
- {
9554
- if (NIL_P(argv[3]))
9555
- arg8 = (time_t)-1;
9556
- else
9557
- arg8 = NUM2LONG(rb_funcall(argv[3], rb_intern("tv_sec"), 0));
9558
- }
9565
+ ecode8 = SWIG_AsVal_unsigned_SS_long(argv[3], &val8);
9566
+ if (!SWIG_IsOK(ecode8)) {
9567
+ SWIG_exception_fail(SWIG_ArgError(ecode8), Ruby_Format_TypeError( "", "time_t","memcached_set_by_key", 8, argv[3] ));
9568
+ }
9569
+ arg8 = (time_t)(val8);
9559
9570
  ecode9 = SWIG_AsVal_unsigned_SS_long(argv[4], &val9);
9560
9571
  if (!SWIG_IsOK(ecode9)) {
9561
9572
  SWIG_exception_fail(SWIG_ArgError(ecode9), Ruby_Format_TypeError( "", "uint32_t","memcached_set_by_key", 9, argv[4] ));
@@ -9582,6 +9593,8 @@ _wrap_memcached_add_by_key(int argc, VALUE *argv, VALUE self) {
9582
9593
  uint32_t arg9 ;
9583
9594
  void *argp1 = 0 ;
9584
9595
  int res1 = 0 ;
9596
+ unsigned long val8 ;
9597
+ int ecode8 = 0 ;
9585
9598
  unsigned long val9 ;
9586
9599
  int ecode9 = 0 ;
9587
9600
  memcached_return result;
@@ -9603,12 +9616,11 @@ _wrap_memcached_add_by_key(int argc, VALUE *argv, VALUE self) {
9603
9616
  arg6 = StringValuePtr(argv[2]);
9604
9617
  arg7 = (size_t) RSTRING_LEN(argv[2]);
9605
9618
  }
9606
- {
9607
- if (NIL_P(argv[3]))
9608
- arg8 = (time_t)-1;
9609
- else
9610
- arg8 = NUM2LONG(rb_funcall(argv[3], rb_intern("tv_sec"), 0));
9611
- }
9619
+ ecode8 = SWIG_AsVal_unsigned_SS_long(argv[3], &val8);
9620
+ if (!SWIG_IsOK(ecode8)) {
9621
+ SWIG_exception_fail(SWIG_ArgError(ecode8), Ruby_Format_TypeError( "", "time_t","memcached_add_by_key", 8, argv[3] ));
9622
+ }
9623
+ arg8 = (time_t)(val8);
9612
9624
  ecode9 = SWIG_AsVal_unsigned_SS_long(argv[4], &val9);
9613
9625
  if (!SWIG_IsOK(ecode9)) {
9614
9626
  SWIG_exception_fail(SWIG_ArgError(ecode9), Ruby_Format_TypeError( "", "uint32_t","memcached_add_by_key", 9, argv[4] ));
@@ -9635,6 +9647,8 @@ _wrap_memcached_replace_by_key(int argc, VALUE *argv, VALUE self) {
9635
9647
  uint32_t arg9 ;
9636
9648
  void *argp1 = 0 ;
9637
9649
  int res1 = 0 ;
9650
+ unsigned long val8 ;
9651
+ int ecode8 = 0 ;
9638
9652
  unsigned long val9 ;
9639
9653
  int ecode9 = 0 ;
9640
9654
  memcached_return result;
@@ -9656,12 +9670,11 @@ _wrap_memcached_replace_by_key(int argc, VALUE *argv, VALUE self) {
9656
9670
  arg6 = StringValuePtr(argv[2]);
9657
9671
  arg7 = (size_t) RSTRING_LEN(argv[2]);
9658
9672
  }
9659
- {
9660
- if (NIL_P(argv[3]))
9661
- arg8 = (time_t)-1;
9662
- else
9663
- arg8 = NUM2LONG(rb_funcall(argv[3], rb_intern("tv_sec"), 0));
9664
- }
9673
+ ecode8 = SWIG_AsVal_unsigned_SS_long(argv[3], &val8);
9674
+ if (!SWIG_IsOK(ecode8)) {
9675
+ SWIG_exception_fail(SWIG_ArgError(ecode8), Ruby_Format_TypeError( "", "time_t","memcached_replace_by_key", 8, argv[3] ));
9676
+ }
9677
+ arg8 = (time_t)(val8);
9665
9678
  ecode9 = SWIG_AsVal_unsigned_SS_long(argv[4], &val9);
9666
9679
  if (!SWIG_IsOK(ecode9)) {
9667
9680
  SWIG_exception_fail(SWIG_ArgError(ecode9), Ruby_Format_TypeError( "", "uint32_t","memcached_replace_by_key", 9, argv[4] ));
@@ -9688,6 +9701,8 @@ _wrap_memcached_prepend_by_key(int argc, VALUE *argv, VALUE self) {
9688
9701
  uint32_t arg9 ;
9689
9702
  void *argp1 = 0 ;
9690
9703
  int res1 = 0 ;
9704
+ unsigned long val8 ;
9705
+ int ecode8 = 0 ;
9691
9706
  unsigned long val9 ;
9692
9707
  int ecode9 = 0 ;
9693
9708
  memcached_return result;
@@ -9709,12 +9724,11 @@ _wrap_memcached_prepend_by_key(int argc, VALUE *argv, VALUE self) {
9709
9724
  arg6 = StringValuePtr(argv[2]);
9710
9725
  arg7 = (size_t) RSTRING_LEN(argv[2]);
9711
9726
  }
9712
- {
9713
- if (NIL_P(argv[3]))
9714
- arg8 = (time_t)-1;
9715
- else
9716
- arg8 = NUM2LONG(rb_funcall(argv[3], rb_intern("tv_sec"), 0));
9717
- }
9727
+ ecode8 = SWIG_AsVal_unsigned_SS_long(argv[3], &val8);
9728
+ if (!SWIG_IsOK(ecode8)) {
9729
+ SWIG_exception_fail(SWIG_ArgError(ecode8), Ruby_Format_TypeError( "", "time_t","memcached_prepend_by_key", 8, argv[3] ));
9730
+ }
9731
+ arg8 = (time_t)(val8);
9718
9732
  ecode9 = SWIG_AsVal_unsigned_SS_long(argv[4], &val9);
9719
9733
  if (!SWIG_IsOK(ecode9)) {
9720
9734
  SWIG_exception_fail(SWIG_ArgError(ecode9), Ruby_Format_TypeError( "", "uint32_t","memcached_prepend_by_key", 9, argv[4] ));
@@ -9741,6 +9755,8 @@ _wrap_memcached_append_by_key(int argc, VALUE *argv, VALUE self) {
9741
9755
  uint32_t arg9 ;
9742
9756
  void *argp1 = 0 ;
9743
9757
  int res1 = 0 ;
9758
+ unsigned long val8 ;
9759
+ int ecode8 = 0 ;
9744
9760
  unsigned long val9 ;
9745
9761
  int ecode9 = 0 ;
9746
9762
  memcached_return result;
@@ -9762,12 +9778,11 @@ _wrap_memcached_append_by_key(int argc, VALUE *argv, VALUE self) {
9762
9778
  arg6 = StringValuePtr(argv[2]);
9763
9779
  arg7 = (size_t) RSTRING_LEN(argv[2]);
9764
9780
  }
9765
- {
9766
- if (NIL_P(argv[3]))
9767
- arg8 = (time_t)-1;
9768
- else
9769
- arg8 = NUM2LONG(rb_funcall(argv[3], rb_intern("tv_sec"), 0));
9770
- }
9781
+ ecode8 = SWIG_AsVal_unsigned_SS_long(argv[3], &val8);
9782
+ if (!SWIG_IsOK(ecode8)) {
9783
+ SWIG_exception_fail(SWIG_ArgError(ecode8), Ruby_Format_TypeError( "", "time_t","memcached_append_by_key", 8, argv[3] ));
9784
+ }
9785
+ arg8 = (time_t)(val8);
9771
9786
  ecode9 = SWIG_AsVal_unsigned_SS_long(argv[4], &val9);
9772
9787
  if (!SWIG_IsOK(ecode9)) {
9773
9788
  SWIG_exception_fail(SWIG_ArgError(ecode9), Ruby_Format_TypeError( "", "uint32_t","memcached_append_by_key", 9, argv[4] ));
@@ -9795,6 +9810,8 @@ _wrap_memcached_cas_by_key(int argc, VALUE *argv, VALUE self) {
9795
9810
  uint64_t arg10 ;
9796
9811
  void *argp1 = 0 ;
9797
9812
  int res1 = 0 ;
9813
+ unsigned long val8 ;
9814
+ int ecode8 = 0 ;
9798
9815
  unsigned long val9 ;
9799
9816
  int ecode9 = 0 ;
9800
9817
  unsigned long long val10 ;
@@ -9818,12 +9835,11 @@ _wrap_memcached_cas_by_key(int argc, VALUE *argv, VALUE self) {
9818
9835
  arg6 = StringValuePtr(argv[2]);
9819
9836
  arg7 = (size_t) RSTRING_LEN(argv[2]);
9820
9837
  }
9821
- {
9822
- if (NIL_P(argv[3]))
9823
- arg8 = (time_t)-1;
9824
- else
9825
- arg8 = NUM2LONG(rb_funcall(argv[3], rb_intern("tv_sec"), 0));
9826
- }
9838
+ ecode8 = SWIG_AsVal_unsigned_SS_long(argv[3], &val8);
9839
+ if (!SWIG_IsOK(ecode8)) {
9840
+ SWIG_exception_fail(SWIG_ArgError(ecode8), Ruby_Format_TypeError( "", "time_t","memcached_cas_by_key", 8, argv[3] ));
9841
+ }
9842
+ arg8 = (time_t)(val8);
9827
9843
  ecode9 = SWIG_AsVal_unsigned_SS_long(argv[4], &val9);
9828
9844
  if (!SWIG_IsOK(ecode9)) {
9829
9845
  SWIG_exception_fail(SWIG_ArgError(ecode9), Ruby_Format_TypeError( "", "uint32_t","memcached_cas_by_key", 9, argv[4] ));
@@ -9956,6 +9972,8 @@ _wrap_MemcachedResultSt_expiration_set(int argc, VALUE *argv, VALUE self) {
9956
9972
  time_t arg2 ;
9957
9973
  void *argp1 = 0 ;
9958
9974
  int res1 = 0 ;
9975
+ unsigned long val2 ;
9976
+ int ecode2 = 0 ;
9959
9977
 
9960
9978
  if ((argc < 1) || (argc > 1)) {
9961
9979
  rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
@@ -9965,12 +9983,11 @@ _wrap_MemcachedResultSt_expiration_set(int argc, VALUE *argv, VALUE self) {
9965
9983
  SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct memcached_result_st *","expiration", 1, self ));
9966
9984
  }
9967
9985
  arg1 = (struct memcached_result_st *)(argp1);
9968
- {
9969
- if (NIL_P(argv[0]))
9970
- arg2 = (time_t)-1;
9971
- else
9972
- arg2 = NUM2LONG(rb_funcall(argv[0], rb_intern("tv_sec"), 0));
9973
- }
9986
+ ecode2 = SWIG_AsVal_unsigned_SS_long(argv[0], &val2);
9987
+ if (!SWIG_IsOK(ecode2)) {
9988
+ SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "time_t","expiration", 2, argv[0] ));
9989
+ }
9990
+ arg2 = (time_t)(val2);
9974
9991
  if (arg1) (arg1)->expiration = arg2;
9975
9992
  return Qnil;
9976
9993
  fail:
@@ -9995,9 +10012,7 @@ _wrap_MemcachedResultSt_expiration_get(int argc, VALUE *argv, VALUE self) {
9995
10012
  }
9996
10013
  arg1 = (struct memcached_result_st *)(argp1);
9997
10014
  result = ((arg1)->expiration);
9998
- {
9999
- vresult = rb_time_new(result, 0);
10000
- }
10015
+ vresult = SWIG_From_unsigned_SS_long((unsigned long)(result));
10001
10016
  return vresult;
10002
10017
  fail:
10003
10018
  return Qnil;
@@ -12850,7 +12865,6 @@ static swig_type_info _swigt__p_memcached_trigger_key = {"_p_memcached_trigger_k
12850
12865
  static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0};
12851
12866
  static swig_type_info _swigt__p_sasl_callback_t = {"_p_sasl_callback_t", "sasl_callback_t *", 0, 0, (void*)0, 0};
12852
12867
  static swig_type_info _swigt__p_size_t = {"_p_size_t", "size_t *", 0, 0, (void*)0, 0};
12853
- static swig_type_info _swigt__p_time_t = {"_p_time_t", "time_t *", 0, 0, (void*)0, 0};
12854
12868
  static swig_type_info _swigt__p_uint32_t = {"_p_uint32_t", "uint32_t *", 0, 0, (void*)0, 0};
12855
12869
  static swig_type_info _swigt__p_uint64_t = {"_p_uint64_t", "uint64_t *", 0, 0, (void*)0, 0};
12856
12870
 
@@ -12885,7 +12899,6 @@ static swig_type_info *swig_type_initial[] = {
12885
12899
  &_swigt__p_p_char,
12886
12900
  &_swigt__p_sasl_callback_t,
12887
12901
  &_swigt__p_size_t,
12888
- &_swigt__p_time_t,
12889
12902
  &_swigt__p_uint32_t,
12890
12903
  &_swigt__p_uint64_t,
12891
12904
  };
@@ -12920,7 +12933,6 @@ static swig_cast_info _swigc__p_memcached_trigger_key[] = { {&_swigt__p_memcach
12920
12933
  static swig_cast_info _swigc__p_p_char[] = { {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}};
12921
12934
  static swig_cast_info _swigc__p_sasl_callback_t[] = { {&_swigt__p_sasl_callback_t, 0, 0, 0},{0, 0, 0, 0}};
12922
12935
  static swig_cast_info _swigc__p_size_t[] = { {&_swigt__p_size_t, 0, 0, 0},{0, 0, 0, 0}};
12923
- static swig_cast_info _swigc__p_time_t[] = { {&_swigt__p_time_t, 0, 0, 0},{0, 0, 0, 0}};
12924
12936
  static swig_cast_info _swigc__p_uint32_t[] = { {&_swigt__p_uint32_t, 0, 0, 0},{0, 0, 0, 0}};
12925
12937
  static swig_cast_info _swigc__p_uint64_t[] = { {&_swigt__p_uint64_t, 0, 0, 0},{0, 0, 0, 0}};
12926
12938
 
@@ -12955,7 +12967,6 @@ static swig_cast_info *swig_cast_initial[] = {
12955
12967
  _swigc__p_p_char,
12956
12968
  _swigc__p_sasl_callback_t,
12957
12969
  _swigc__p_size_t,
12958
- _swigc__p_time_t,
12959
12970
  _swigc__p_uint32_t,
12960
12971
  _swigc__p_uint64_t,
12961
12972
  };