ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Net-SNMP-XS/XS.pm
(Generate patch)

Comparing Net-SNMP-XS/XS.pm (file contents):
Revision 1.2 by root, Wed Apr 8 10:39:32 2009 UTC vs.
Revision 1.11 by root, Thu Jul 29 02:52:07 2010 UTC

… …
13This module tries to speed up Net::SNMP response packet decoding. 13This module tries to speed up Net::SNMP response packet decoding.
14 14
15It does this by overriding a few selected internal method by (almost) 15It does this by overriding a few selected internal method by (almost)
16equivalent XS methods. 16equivalent XS methods.
17 17
18This currently reduces decode time by some 70%. 18This currently reduces decode time by a factor of ten for typical bulk
19responses.
19 20
20There are currently the following limitations when using this module: 21There are currently the following limitations when using this module:
21 22
22=over 4 23=over 4
23 24
24=item leading dots are required for iods 25=item overriding internal functions might cause the module to
26malfunction with future versions of Net::SNMP
25 27
26=item error handling is currently broken (but parse errors will be detected) 28=item error messages will be simpler/different
27
28=item oid components are limited to unsigned 32 bit integers
29 29
30=item translation will be ignored (all values will be delivered "raw") 30=item translation will be ignored (all values will be delivered "raw")
31 31
32=item a 64 bit perl is required
33
34=item a moderately modern (>= C99) C compiler is required 32=item a moderately modern (>= C99) C compiler is required
35 33
36=item only tested with 5.10 34=item only tested with 5.10, no intentions to port to older perls
35
36=item duplicate OIDs are not supported
37
38=item REPORT PDUs are not supported
37 39
38=back 40=back
39 41
40=cut 42=cut
41 43
… …
44use strict qw(vars subs); 46use strict qw(vars subs);
45no warnings; 47no warnings;
46 48
47use Guard; 49use Guard;
48 50
51use Net::SNMP ();
49use Net::SNMP::PDU (); 52use Net::SNMP::PDU ();
50use Net::SNMP::Message (); 53use Net::SNMP::Message ();
51use Net::SNMP::MessageProcessing (); 54use Net::SNMP::MessageProcessing ();
52 55
53our $VERSION; 56our $VERSION;
54our $old_prepare;
55 57
56BEGIN { 58BEGIN {
57 $VERSION = '0.01'; 59 $VERSION = '1.1';
58 60
59 $old_prepare = \&Net::SNMP::MessageProcessing::prepare_data_elements; 61 # this overrides many methods inside Net::SNMP and it's submodules
60
61 # this overrides many methods inside
62 require XSLoader; 62 require XSLoader;
63 XSLoader::load Net::SNMP::XS, $VERSION; 63 XSLoader::load Net::SNMP::XS, $VERSION;
64} 64}
65 65
66sub Net::SNMP::MessageProcessing::prepare_data_elements { 66package Net::SNMP::Message;
67 my ($self, $msg) = @_;
68 67
69 set_msg $msg, $msg->{_buffer}; 68Net::SNMP::XS::set_type INTEGER , \&_process_integer32;
70 scope_guard \&clr_msg; 69Net::SNMP::XS::set_type OCTET_STRING , \&_process_octet_string;
71 &$old_prepare 70Net::SNMP::XS::set_type NULL , \&_process_null;
72} 71Net::SNMP::XS::set_type OBJECT_IDENTIFIER, \&_process_object_identifier;
72Net::SNMP::XS::set_type SEQUENCE , \&_process_sequence;
73Net::SNMP::XS::set_type IPADDRESS , \&_process_ipaddress;
74Net::SNMP::XS::set_type COUNTER , \&_process_counter;
75Net::SNMP::XS::set_type GAUGE , \&_process_gauge;
76Net::SNMP::XS::set_type TIMETICKS , \&_process_timeticks;
77Net::SNMP::XS::set_type OPAQUE , \&_process_opaque;
78Net::SNMP::XS::set_type COUNTER64 , \&_process_counter64;
79Net::SNMP::XS::set_type NOSUCHOBJECT , \&_process_nosuchobject;
80Net::SNMP::XS::set_type NOSUCHINSTANCE , \&_process_nosuchinstance;
81Net::SNMP::XS::set_type ENDOFMIBVIEW , \&_process_endofmibview;
82Net::SNMP::XS::set_type GET_REQUEST , \&_process_get_request;
83Net::SNMP::XS::set_type GET_NEXT_REQUEST , \&_process_get_next_request;
84Net::SNMP::XS::set_type GET_RESPONSE , \&_process_get_response;
85Net::SNMP::XS::set_type SET_REQUEST , \&_process_set_request;
86Net::SNMP::XS::set_type TRAP , \&_process_trap;
87Net::SNMP::XS::set_type GET_BULK_REQUEST , \&_process_get_bulk_request;
88Net::SNMP::XS::set_type INFORM_REQUEST , \&_process_inform_request;
89Net::SNMP::XS::set_type SNMPV2_TRAP , \&_process_v2_trap;
90Net::SNMP::XS::set_type REPORT , \&_process_report;
73 91
74# almost direct copy from Net::SNMP::Message, as we cannot access $process_methods 92package Net::SNMP::PDU;
93
94# var_bind_list hardcodes oid_lex_sort. *sigh*
95# we copy it 1:1, except for using oid_lex_sort.
96
97sub var_bind_list
75{ 98{
76 package Net::SNMP::Message; 99 my ($this, $vbl, $types) = @_;
77 100
78 my @process_methods; 101 return if defined($this->{_error});
79 102
80 $process_methods [INTEGER ] = \&_process_integer32; 103 if (@_ > 1) {
81 $process_methods [OCTET_STRING ] = \&_process_octet_string; 104 # The VarBindList HASH is being updated from an external
82 $process_methods [NULL ] = \&_process_null; 105 # source. We need to update the VarBind names ARRAY to
83 $process_methods [OBJECT_IDENTIFIER] = \&_process_object_identifier; 106 # correspond to the new keys of the HASH. If the updated
84 $process_methods [SEQUENCE ] = \&_process_sequence; 107 # information is valid, we will use lexicographical ordering
85 $process_methods [IPADDRESS ] = \&_process_ipaddress; 108 # for the ARRAY entries since we do not have a PDU to use
86 $process_methods [COUNTER ] = \&_process_counter; 109 # to determine the ordering. The ASN.1 types HASH is also
87 $process_methods [GAUGE ] = \&_process_gauge; 110 # updated here if a cooresponding HASH is passed. We double
88 $process_methods [TIMETICKS ] = \&_process_timeticks; 111 # check the mapping by populating the hash with the keys of
89 $process_methods [OPAQUE ] = \&_process_opaque; 112 # the VarBindList HASH.
90 $process_methods [COUNTER64 ] = \&_process_counter64;
91 $process_methods [NOSUCHOBJECT ] = \&_process_nosuchobject;
92 $process_methods [NOSUCHINSTANCE ] = \&_process_nosuchinstance;
93 $process_methods [ENDOFMIBVIEW ] = \&_process_endofmibview;
94 $process_methods [GET_REQUEST ] = \&_process_get_request;
95 $process_methods [GET_NEXT_REQUEST ] = \&_process_get_next_request;
96 $process_methods [GET_RESPONSE ] = \&_process_get_response;
97 $process_methods [SET_REQUEST ] = \&_process_set_request;
98 $process_methods [TRAP ] = \&_process_trap;
99 $process_methods [GET_BULK_REQUEST ] = \&_process_get_bulk_request;
100 $process_methods [INFORM_REQUEST ] = \&_process_inform_request;
101 $process_methods [SNMPV2_TRAP ] = \&_process_v2_trap;
102 $process_methods [REPORT ] = \&_process_report;
103 113
104 # should be done in XS 114 if (!defined($vbl) || (ref($vbl) ne 'HASH')) {
105 sub process
106 {
107# my ($this, $expected, $found) = @_;
108 115
109 return $_[0]->_error if defined($_[0]->{_error}); 116 $this->{_var_bind_list} = undef;
110 return $_[0]->_error unless defined(my $type = _buffer_get($_[0], 1)); 117 $this->{_var_bind_names} = [];
118 $this->{_var_bind_types} = undef;
111 119
112 $type = unpack 'C', $type; 120 } else {
113 121
114 if ($process_methods[$type]) { 122 $this->{_var_bind_list} = $vbl;
115 if (@_ >= 2 && (defined $_[1]) && $type != $_[1]) { 123
116 return $_[0]->_error( 124 @{$this->{_var_bind_names}} = Net::SNMP::oid_lex_sort keys %$vbl;
117 'Expected %s, but found %s', asn1_itoa($_[1]), asn1_itoa($type) 125
118 ); 126 if (!defined($types) || (ref($types) ne 'HASH')) {
127 $types = {};
119 } 128 }
120 $_[2] = $type if (@_ == 3); 129
121 $process_methods[$type]->($_[0], $type); 130 map {
122 } else { 131 $this->{_var_bind_types}->{$_} =
123 $_[0]->_error('Unknown ASN.1 type [0x%02x]', $type); 132 exists($types->{$_}) ? $types->{$_} : undef;
133 } keys(%{$vbl});
134
124 } 135 }
136
125 } 137 }
138
139 $this->{_var_bind_list};
126} 140}
127 141
1281; 1421;
129 143
130=head1 AUTHOR 144=head1 AUTHOR

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines