ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.38 by root, Thu Aug 24 17:29:30 2006 UTC vs.
Revision 1.41 by root, Fri Aug 25 15:25:12 2006 UTC

… …
11use Event; 11use Event;
12$Event::Eval = 1; # no idea why this is required, but it is 12$Event::Eval = 1; # no idea why this is required, but it is
13 13
14use strict; 14use strict;
15 15
16our %COMMAND; 16our %COMMAND = ();
17our @EVENT; 17our @EVENT;
18our @PLUGIN_EVENT; 18our @PLUGIN_EVENT;
19our %PROP_TYPE; 19our %PROP_TYPE;
20our %PROP_IDX; 20our %PROP_IDX;
21our $LIBDIR = maps_directory "perl"; 21our $LIBDIR = maps_directory "perl";
… …
71prop_gen MAP_PROP => "cf::map"; 71prop_gen MAP_PROP => "cf::map";
72prop_gen ARCH_PROP => "cf::arch"; 72prop_gen ARCH_PROP => "cf::arch";
73 73
74# guessed hierarchies 74# guessed hierarchies
75 75
76@ext::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 76@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
77@ext::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object'; 77@safe::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object';
78 78
79# we bless all objects into derived classes to force a method lookup 79# we bless all objects into (empty) derived classes to force a method lookup
80# within the Safe compartment. 80# within the Safe compartment.
81for my $pkg (qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region cf::arch)) { 81for my $pkg (qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region cf::arch)) {
82 no strict 'refs'; 82 no strict 'refs';
83 @{"ext::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 83 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
84} 84}
85 85
86$Event::DIED = sub { 86$Event::DIED = sub {
87 warn "error in event callback: @_"; 87 warn "error in event callback: @_";
88}; 88};
… …
91my @exts; 91my @exts;
92my @hook; 92my @hook;
93my %command; 93my %command;
94my %extcmd; 94my %extcmd;
95 95
96#############################################################################
97# "new" plug-in system
98
99=item cf::object::attach ... # NYI
100
101=item cf::attach_global ...
102
103=item cf::attach_to_type ...
104
105=item cf::attach_to_objects ...
106
107=item cf::attach_to_players ...
108
109=item cf::attach_to_maps ...
110
111 prio => $number, # lower is earlier
112 on_xxx => \&cb,
113 package => package::,
114
115=cut
116
117# the following variables are defined in .xs and must not be re-created
118our @CB_GLOBAL = (); # registry for all global events
119our @CB_OBJECT = ();
120our @CB_PLAYER = ();
121our @CB_TYPE = (); # registry for type (cf-object class) based events
122our @CB_MAP = ();
123
124sub _attach_cb($\%$$$) {
125 my ($registry, $undo, $event, $prio, $cb) = @_;
126
127 use sort 'stable';
128
129 $cb = [$prio, $cb];
130
131 @{$registry->[$event]} = sort
132 { $a->[0] cmp $b->[0] }
133 @{$registry->[$event] || []}, $cb;
134
135 push @{$undo->{cb}}, [$event, $cb];
136}
137
138# attach handles attaching event callbacks
139# the only thing the caller has to do is pass the correct
140# registry (== where the callback attaches to).
141sub _attach(\@$\@) {
142 my ($registry, $klass, $arg) = @_;
143
144 my $prio = 0;
145
146 my %undo = (
147 registry => $registry,
148 cb => [],
149 );
150
151 my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
152
153 while (@$arg) {
154 my $type = shift @$arg;
155
156 if ($type eq "prio") {
157 $prio = shift @$arg;
158
159 } elsif ($type eq "package") {
160 my $pkg = shift @$arg;
161
162 while (my ($name, $id) = each %cb_id) {
163 if (my $cb = $pkg->can ($name)) {
164 _attach_cb $registry, %undo, $id, $prio, $cb;
165 }
166 }
167
168 } elsif (exists $cb_id{$type}) {
169 _attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @$arg;
170
171 } elsif (ref $type) {
172 warn "attaching objects not supported, ignoring.\n";
173
174 } else {
175 shift @$arg;
176 warn "attach argument '$type' not supported, ignoring.\n";
177 }
178 }
179
180 \%undo
181}
182
183sub cf::object::attach {
184 die;
185}
186
187sub attach_global {
188 _attach @CB_GLOBAL, KLASS_GLOBAL, @_
189}
190
191sub attach_to_type {
192 my $type = shift;
193 _attach @{$CB_TYPE[$type]}, KLASS_OBJECT, @_
194}
195
196sub attach_to_objects {
197 _attach @CB_OBJECT, KLASS_OBJECT, @_
198}
199
200sub attach_to_players {
201 _attach @CB_PLAYER, KLASS_PLAYER, @_
202}
203
204sub attach_to_maps {
205 _attach @CB_MAP, KLASS_MAP, @_
206}
207
208our $override;
209
210sub override() {
211 $override = 1
212}
213
214sub invoke {
215 my $event = shift;
216 my $callbacks = shift;
217
218 local $override;
219
220 for (@$callbacks) {
221 eval { &{$_->[1]} };
222
223 if ($@) {
224 warn "$@";
225 warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n";
226 override;
227 }
228
229 return 1 if $override;
230 }
231
232 0
233}
234
235#############################################################################
236# old plug-in events
237
96sub inject_event { 238sub inject_event {
97 my $extension = shift; 239 my $extension = shift;
98 my $event_code = shift; 240 my $event_code = shift;
99 241
100 my $cb = $hook[$event_code]{$extension} 242 my $cb = $hook[$event_code]{$extension}
… …
157 299
158 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 300 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
159 my $base = $1; 301 my $base = $1;
160 my $pkg = $1; 302 my $pkg = $1;
161 $pkg =~ s/[^[:word:]]/_/g; 303 $pkg =~ s/[^[:word:]]/_/g;
162 $pkg = "cf::ext::$pkg"; 304 $pkg = "ext::$pkg";
163 305
164 warn "loading '$path' into '$pkg'\n"; 306 warn "loading '$path' into '$pkg'\n";
165 307
166 open my $fh, "<:utf8", $path 308 open my $fh, "<:utf8", $path
167 or die "$path: $!"; 309 or die "$path: $!";
… …
264 } 406 }
265 407
266 Symbol::delete_package $k; 408 Symbol::delete_package $k;
267 } 409 }
268 410
269 # 4. get rid of ext::, as good as possible 411 # 4. get rid of safe::, as good as possible
270 Symbol::delete_package "ext::$_" 412 Symbol::delete_package "safe::$_"
271 for qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region); 413 for qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region);
272 414
273 # 5. remove register_script_function callbacks 415 # 5. remove register_script_function callbacks
274 # TODO 416 # TODO
275 417
276 # 6. unload cf.pm "a bit" 418 # 6. unload cf.pm "a bit"
277 delete $INC{"cf.pm"}; 419 delete $INC{"cf.pm"};
278 420
279 # don't, removes xs symbols, too 421 # don't, removes xs symbols, too,
422 # and global variables created in xs
280 #Symbol::delete_package __PACKAGE__; 423 #Symbol::delete_package __PACKAGE__;
281 424
282 # 7. reload cf.pm 425 # 7. reload cf.pm
283 $msg->("reloading cf.pm"); 426 $msg->("reloading cf.pm");
284 require cf; 427 require cf;
… …
344} 487}
345 488
346############################################################################# 489#############################################################################
347# load/save/clean perl data associated with a map 490# load/save/clean perl data associated with a map
348 491
349*on_mapclean = sub { 492*cf::mapsupport::on_clean = sub {
350 my ($map) = @_; 493 my ($map) = @_;
351 494
352 my $path = $map->tmpname; 495 my $path = $map->tmpname;
353 defined $path or return; 496 defined $path or return;
354 497
355 unlink "$path.cfperl"; 498 unlink "$path.cfperl";
356}; 499};
357 500
358*on_mapin = 501*cf::mapsupport::on_swapin =
359*on_mapload = sub { 502*cf::mapsupport::on_load = sub {
360 my ($map) = @_; 503 my ($map) = @_;
361 504
362 my $path = $map->tmpname; 505 my $path = $map->tmpname;
363 $path = $map->path unless defined $path; 506 $path = $map->path unless defined $path;
364 507
… …
371 or return; # too new 514 or return; # too new
372 515
373 $map->_set_obs ($data->{obs}); 516 $map->_set_obs ($data->{obs});
374}; 517};
375 518
376*on_mapout = sub { 519*cf::mapsupport::on_swapout = sub {
377 my ($map) = @_; 520 my ($map) = @_;
378 521
379 my $path = $map->tmpname; 522 my $path = $map->tmpname;
380 $path = $map->path unless defined $path; 523 $path = $map->path unless defined $path;
381 524
… …
398 } else { 541 } else {
399 unlink "$path.cfperl"; 542 unlink "$path.cfperl";
400 } 543 }
401}; 544};
402 545
546attach_to_maps prio => -10000, package => cf::mapsupport::;
547
403############################################################################# 548#############################################################################
404# load/save perl data associated with player->ob objects 549# load/save perl data associated with player->ob objects
405 550
406sub all_objects(@) { 551sub all_objects(@) {
407 @_, map all_objects ($_->inv), @_ 552 @_, map all_objects ($_->inv), @_
408} 553}
409 554
410*on_player_load = sub { 555attach_to_players
556 on_load => sub {
411 my ($ob, $path) = @_; 557 my ($pl, $path) = @_;
412 558
413 for my $o (all_objects $ob) { 559 for my $o (all_objects $pl->ob) {
414 if (my $value = $o->get_ob_key_value ("_perl_data")) { 560 if (my $value = $o->get_ob_key_value ("_perl_data")) {
415 $o->set_ob_key_value ("_perl_data"); 561 $o->set_ob_key_value ("_perl_data");
416 562
417 %$o = %{ Storable::thaw pack "H*", $value }; 563 %$o = %{ Storable::thaw pack "H*", $value };
564 }
418 } 565 }
419 } 566 },
420}; 567 on_save => sub {
421
422*on_player_save = sub {
423 my ($ob, $path) = @_; 568 my ($pl, $path) = @_;
424 569
425 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_) 570 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
426 for grep %$_, all_objects $ob; 571 for grep %$_, all_objects $pl->ob;
427}; 572 },
573;
428 574
429############################################################################# 575#############################################################################
430# core extensions - in perl 576# core extensions - in perl
431 577
432=item cf::player::exists $login 578=item cf::player::exists $login
… …
494 ["cf::object::player" => qw(player)], 640 ["cf::object::player" => qw(player)],
495 ["cf::player" => qw(peaceful)], 641 ["cf::player" => qw(peaceful)],
496) { 642) {
497 no strict 'refs'; 643 no strict 'refs';
498 my ($pkg, @funs) = @$_; 644 my ($pkg, @funs) = @$_;
499 *{"ext::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 645 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
500 for @funs; 646 for @funs;
501} 647}
502 648
503sub safe_eval($;@) { 649sub safe_eval($;@) {
504 my ($code, %vars) = @_; 650 my ($code, %vars) = @_;
… …
506 my $qcode = $code; 652 my $qcode = $code;
507 $qcode =~ s/"/‟/g; # not allowed in #line filenames 653 $qcode =~ s/"/‟/g; # not allowed in #line filenames
508 $qcode =~ s/\n/\\n/g; 654 $qcode =~ s/\n/\\n/g;
509 655
510 local $_; 656 local $_;
511 local @ext::cf::_safe_eval_args = values %vars; 657 local @safe::cf::_safe_eval_args = values %vars;
512 658
513 $code = 659 $code =
514 "do {\n" 660 "do {\n"
515 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 661 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
516 . "#line 0 \"{$qcode}\"\n" 662 . "#line 0 \"{$qcode}\"\n"
… …
527 673
528sub register_script_function { 674sub register_script_function {
529 my ($fun, $cb) = @_; 675 my ($fun, $cb) = @_;
530 676
531 no strict 'refs'; 677 no strict 'refs';
532 *{"ext::$fun"} = $safe_hole->wrap ($cb); 678 *{"safe::$fun"} = $safe_hole->wrap ($cb);
533} 679}
534 680
535############################################################################# 681#############################################################################
536# the server's main() 682# the server's main()
537 683
538sub run { 684sub main {
539 Event::loop; 685 Event::loop;
540} 686}
541 687
542############################################################################# 688#############################################################################
543# initialisation 689# initialisation

Diff Legend

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