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.35 by root, Thu Aug 24 13:35:48 2006 UTC vs.
Revision 1.44 by root, Sat Aug 26 08:44:06 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 %PROP_TYPE; 19our %PROP_TYPE;
19our %PROP_IDX; 20our %PROP_IDX;
20our $LIBDIR = maps_directory "perl"; 21our $LIBDIR = maps_directory "perl";
21 22
22our $TICK = MAX_TIME * 1e-6; 23our $TICK = MAX_TIME * 1e-6;
23our $TICK_WATCHER; 24our $TICK_WATCHER;
24our $NEXT_TICK; 25our $NEXT_TICK;
25 26
26BEGIN { 27BEGIN {
27 @EVENT = map lc, @EVENT; 28 @PLUGIN_EVENT = map lc, @PLUGIN_EVENT;
28 29
29 *CORE::GLOBAL::warn = sub { 30 *CORE::GLOBAL::warn = sub {
30 my $msg = join "", @_; 31 my $msg = join "", @_;
31 $msg .= "\n" 32 $msg .= "\n"
32 unless $msg =~ /\n$/; 33 unless $msg =~ /\n$/;
… …
70prop_gen MAP_PROP => "cf::map"; 71prop_gen MAP_PROP => "cf::map";
71prop_gen ARCH_PROP => "cf::arch"; 72prop_gen ARCH_PROP => "cf::arch";
72 73
73# guessed hierarchies 74# guessed hierarchies
74 75
75@ext::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 76@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
76@ext::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object'; 77@safe::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object';
77 78
78# 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
79# within the Safe compartment. 80# within the Safe compartment.
80for 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)) {
81 no strict 'refs'; 82 no strict 'refs';
82 @{"ext::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 83 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
83} 84}
84 85
85$Event::DIED = sub { 86$Event::DIED = sub {
86 warn "error in event callback: @_"; 87 warn "error in event callback: @_";
87}; 88};
… …
90my @exts; 91my @exts;
91my @hook; 92my @hook;
92my %command; 93my %command;
93my %extcmd; 94my %extcmd;
94 95
96#############################################################################
97# object support
98
99sub reattach {
100 warn "reattach<@_>\n";
101}
102
103sub instantiate {
104 warn "instantiate<@_>\n";
105}
106
107sub clone {
108 warn "clone<@_>\n";
109}
110
111#############################################################################
112# "new" plug-in system
113
114=item cf::object::attach ... # NYI
115
116=item cf::attach_global ...
117
118=item cf::attach_to_type ...
119
120=item cf::attach_to_objects ...
121
122=item cf::attach_to_players ...
123
124=item cf::attach_to_maps ...
125
126 prio => $number, # lower is earlier
127 on_xxx => \&cb,
128 package => package::,
129
130=cut
131
132# the following variables are defined in .xs and must not be re-created
133our @CB_GLOBAL = (); # registry for all global events
134our @CB_OBJECT = ();
135our @CB_PLAYER = ();
136our @CB_TYPE = (); # registry for type (cf-object class) based events
137our @CB_MAP = ();
138
139sub _attach_cb($\%$$$) {
140 my ($registry, $undo, $event, $prio, $cb) = @_;
141
142 use sort 'stable';
143
144 $cb = [$prio, $cb];
145
146 @{$registry->[$event]} = sort
147 { $a->[0] cmp $b->[0] }
148 @{$registry->[$event] || []}, $cb;
149
150 push @{$undo->{cb}}, [$event, $cb];
151}
152
153# attach handles attaching event callbacks
154# the only thing the caller has to do is pass the correct
155# registry (== where the callback attaches to).
156sub _attach(\@$\@) {
157 my ($registry, $klass, $arg) = @_;
158
159 my $prio = 0;
160
161 my %undo = (
162 registry => $registry,
163 cb => [],
164 );
165
166 my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
167
168 while (@$arg) {
169 my $type = shift @$arg;
170
171 if ($type eq "prio") {
172 $prio = shift @$arg;
173
174 } elsif ($type eq "package") {
175 my $pkg = shift @$arg;
176
177 while (my ($name, $id) = each %cb_id) {
178 if (my $cb = $pkg->can ($name)) {
179 _attach_cb $registry, %undo, $id, $prio, $cb;
180 }
181 }
182
183 } elsif (exists $cb_id{$type}) {
184 _attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @$arg;
185
186 } elsif (ref $type) {
187 warn "attaching objects not supported, ignoring.\n";
188
189 } else {
190 shift @$arg;
191 warn "attach argument '$type' not supported, ignoring.\n";
192 }
193 }
194
195 \%undo
196}
197
198sub cf::object::attach {
199 die;
200}
201
202sub attach_global {
203 _attach @CB_GLOBAL, KLASS_GLOBAL, @_
204}
205
206sub attach_to_type {
207 my $type = shift;
208 _attach @{$CB_TYPE[$type]}, KLASS_OBJECT, @_
209}
210
211sub attach_to_objects {
212 _attach @CB_OBJECT, KLASS_OBJECT, @_
213}
214
215sub attach_to_players {
216 _attach @CB_PLAYER, KLASS_PLAYER, @_
217}
218
219sub attach_to_maps {
220 _attach @CB_MAP, KLASS_MAP, @_
221}
222
223our $override;
224
225sub override() {
226 $override = 1
227}
228
229sub invoke {
230 my $event = shift;
231 my $callbacks = shift;
232
233 local $override;
234
235 for (@$callbacks) {
236 eval { &{$_->[1]} };
237
238 if ($@) {
239 warn "$@";
240 warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n";
241 override;
242 }
243
244 return 1 if $override;
245 }
246
247 0
248}
249
250#############################################################################
251# old plug-in events
252
95sub inject_event { 253sub inject_event {
96 my $extension = shift; 254 my $extension = shift;
97 my $event_code = shift; 255 my $event_code = shift;
98 256
99 my $cb = $hook[$event_code]{$extension} 257 my $cb = $hook[$event_code]{$extension}
… …
141} 299}
142 300
143sub register { 301sub register {
144 my ($base, $pkg) = @_; 302 my ($base, $pkg) = @_;
145 303
146 for my $idx (0 .. $#EVENT) { 304 for my $idx (0 .. $#PLUGIN_EVENT) {
147 if (my $ref = $pkg->can ("on_$EVENT[$idx]")) { 305 if (my $ref = $pkg->can ("on_$PLUGIN_EVENT[$idx]")) {
148 #warn "registering $EVENT[$idx] hook to '$pkg'\n"; 306 #warn "registering $PLUGIN_EVENT[$idx] hook to '$pkg'\n";
149 $hook[$idx]{$base} = $ref; 307 $hook[$idx]{$base} = $ref;
150 } 308 }
151 } 309 }
152} 310}
153 311
… …
156 314
157 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 315 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
158 my $base = $1; 316 my $base = $1;
159 my $pkg = $1; 317 my $pkg = $1;
160 $pkg =~ s/[^[:word:]]/_/g; 318 $pkg =~ s/[^[:word:]]/_/g;
161 $pkg = "cf::ext::$pkg"; 319 $pkg = "ext::$pkg";
162 320
163 warn "loading '$path' into '$pkg'\n"; 321 warn "loading '$path' into '$pkg'\n";
164 322
165 open my $fh, "<:utf8", $path 323 open my $fh, "<:utf8", $path
166 or die "$path: $!"; 324 or die "$path: $!";
… …
187 my ($pkg) = @_; 345 my ($pkg) = @_;
188 346
189 warn "removing extension $pkg\n"; 347 warn "removing extension $pkg\n";
190 348
191 # remove hooks 349 # remove hooks
192 for my $idx (0 .. $#EVENT) { 350 for my $idx (0 .. $#PLUGIN_EVENT) {
193 delete $hook[$idx]{$pkg}; 351 delete $hook[$idx]{$pkg};
194 } 352 }
195 353
196 # remove commands 354 # remove commands
197 for my $name (keys %command) { 355 for my $name (keys %command) {
… …
209 # remove extcmds 367 # remove extcmds
210 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 368 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
211 delete $extcmd{$name}; 369 delete $extcmd{$name};
212 } 370 }
213 371
214 if (my $cb = $pkg->can ("on_unload")) { 372 if (my $cb = $pkg->can ("unload")) {
215 eval { 373 eval {
216 $cb->($pkg); 374 $cb->($pkg);
217 1 375 1
218 } or warn "$pkg unloaded, but with errors: $@"; 376 } or warn "$pkg unloaded, but with errors: $@";
219 } 377 }
… …
231 1 389 1
232 } or warn "$ext not loaded: $@"; 390 } or warn "$ext not loaded: $@";
233 } 391 }
234} 392}
235 393
394sub _perl_reload(&) {
395 my ($msg) = @_;
396
397 $msg->("reloading...");
398
399 eval {
400 # 1. cancel all watchers
401 $_->cancel for Event::all_watchers;
402
403 # 2. unload all extensions
404 for (@exts) {
405 $msg->("unloading <$_>");
406 unload_extension $_;
407 }
408
409 # 3. unload all modules loaded from $LIBDIR
410 while (my ($k, $v) = each %INC) {
411 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
412
413 $msg->("removing <$k>");
414 delete $INC{$k};
415
416 $k =~ s/\.pm$//;
417 $k =~ s/\//::/g;
418
419 if (my $cb = $k->can ("unload_module")) {
420 $cb->();
421 }
422
423 Symbol::delete_package $k;
424 }
425
426 # 4. get rid of safe::, as good as possible
427 Symbol::delete_package "safe::$_"
428 for qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region);
429
430 # 5. remove register_script_function callbacks
431 # TODO
432
433 # 6. unload cf.pm "a bit"
434 delete $INC{"cf.pm"};
435
436 # don't, removes xs symbols, too,
437 # and global variables created in xs
438 #Symbol::delete_package __PACKAGE__;
439
440 # 7. reload cf.pm
441 $msg->("reloading cf.pm");
442 require cf;
443 };
444 $msg->($@) if $@;
445
446 $msg->("reloaded");
447};
448
449sub perl_reload() {
450 _perl_reload {
451 warn $_[0];
452 print "$_[0]\n";
453 };
454}
455
236register_command "perl-reload", 0, sub { 456register_command "perl-reload", 0, sub {
237 my ($who, $arg) = @_; 457 my ($who, $arg) = @_;
238 458
239 if ($who->flag (FLAG_WIZ)) { 459 if ($who->flag (FLAG_WIZ)) {
240 $who->message ("reloading..."); 460 _perl_reload {
241 461 warn $_[0];
242 warn "reloading...\n"; 462 $who->message ($_[0]);
243 eval {
244 # 1. cancel all watchers
245 $_->cancel for Event::all_watchers;
246
247 # 2. unload all extensions
248 for (@exts) {
249 $who->message ("unloading <$_>");
250 unload_extension $_;
251 }
252
253 # 3. unload all modules loaded from $LIBDIR
254 while (my ($k, $v) = each %INC) {
255 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
256
257 $who->message ("removing <$k>");
258 delete $INC{$k};
259
260 $k =~ s/\.pm$//;
261 $k =~ s/\//::/g;
262
263 if (my $cb = $k->can ("unload_module")) {
264 $cb->();
265 }
266
267 Symbol::delete_package $k;
268 }
269
270 # 4. get rid of ext::, as good as possible
271 Symbol::delete_package "ext::$_"
272 for qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region);
273
274 # 5. remove register_script_function callbacks
275 # TODO
276
277 # 6. unload cf.pm "a bit"
278 delete $INC{"cf.pm"};
279
280 # don't, removes xs symbols, too
281 #Symbol::delete_package __PACKAGE__;
282
283 # 7. reload cf.pm
284 $who->message ("reloading cf.pm");
285 require cf;
286 }; 463 };
287 warn $@ if $@;
288 $who->message ($@) if $@;
289 warn "reloaded\n";
290
291 $who->message ("reloaded");
292 } else {
293 $who->message ("Intruder Alert!");
294 } 464 }
295}; 465};
296 466
297############################################################################# 467#############################################################################
298# utility functions 468# utility functions
… …
311 481
312############################################################################# 482#############################################################################
313# extcmd framework, basically convert ext <msg> 483# extcmd framework, basically convert ext <msg>
314# into pkg::->on_extcmd_arg1 (...) while shortcutting a few 484# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
315 485
316sub on_extcmd { 486attach_to_players
487 on_extcmd => sub {
317 my ($pl, $buf) = @_; 488 my ($pl, $buf) = @_;
318 489
319 my $msg = eval { from_json $buf }; 490 my $msg = eval { from_json $buf };
320 491
321 if (ref $msg) { 492 if (ref $msg) {
322 if (my $cb = $extcmd{$msg->{msgtype}}) { 493 if (my $cb = $extcmd{$msg->{msgtype}}) {
323 if (my %reply = $cb->[0]->($pl, $msg)) { 494 if (my %reply = $cb->[0]->($pl, $msg)) {
324 $pl->ext_reply ($msg->{msgid}, %reply); 495 $pl->ext_reply ($msg->{msgid}, %reply);
496 }
325 } 497 }
498 } else {
499 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
326 } 500 }
327 } else { 501
328 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 502 cf::override;
329 } 503 },
330 504;
331 1
332}
333 505
334############################################################################# 506#############################################################################
335# load/save/clean perl data associated with a map 507# load/save/clean perl data associated with a map
336 508
337*on_mapclean = sub { 509*cf::mapsupport::on_clean = sub {
338 my ($map) = @_; 510 my ($map) = @_;
339 511
340 my $path = $map->tmpname; 512 my $path = $map->tmpname;
341 defined $path or return; 513 defined $path or return;
342 514
343 unlink "$path.cfperl"; 515 unlink "$path.cfperl";
344}; 516};
345 517
346*on_mapin = 518*cf::mapsupport::on_swapin =
347*on_mapload = sub { 519*cf::mapsupport::on_load = sub {
348 my ($map) = @_; 520 my ($map) = @_;
349 521
350 my $path = $map->tmpname; 522 my $path = $map->tmpname;
351 $path = $map->path unless defined $path; 523 $path = $map->path unless defined $path;
352 524
… …
359 or return; # too new 531 or return; # too new
360 532
361 $map->_set_obs ($data->{obs}); 533 $map->_set_obs ($data->{obs});
362}; 534};
363 535
364*on_mapout = sub { 536*cf::mapsupport::on_swapout = sub {
365 my ($map) = @_; 537 my ($map) = @_;
366 538
367 my $path = $map->tmpname; 539 my $path = $map->tmpname;
368 $path = $map->path unless defined $path; 540 $path = $map->path unless defined $path;
369 541
… …
386 } else { 558 } else {
387 unlink "$path.cfperl"; 559 unlink "$path.cfperl";
388 } 560 }
389}; 561};
390 562
563attach_to_maps prio => -10000, package => cf::mapsupport::;
564
391############################################################################# 565#############################################################################
392# load/save perl data associated with player->ob objects 566# load/save perl data associated with player->ob objects
393 567
394sub all_objects(@) { 568sub all_objects(@) {
395 @_, map all_objects ($_->inv), @_ 569 @_, map all_objects ($_->inv), @_
396} 570}
397 571
398*on_player_load = sub { 572attach_to_players
573 on_load => sub {
399 my ($ob, $path) = @_; 574 my ($pl, $path) = @_;
400 575
401 for my $o (all_objects $ob) { 576 for my $o (all_objects $pl->ob) {
402 if (my $value = $o->get_ob_key_value ("_perl_data")) { 577 if (my $value = $o->get_ob_key_value ("_perl_data")) {
403 $o->set_ob_key_value ("_perl_data"); 578 $o->set_ob_key_value ("_perl_data");
404 579
405 %$o = %{ Storable::thaw pack "H*", $value }; 580 %$o = %{ Storable::thaw pack "H*", $value };
581 }
406 } 582 }
407 } 583 },
408}; 584 on_save => sub {
409
410*on_player_save = sub {
411 my ($ob, $path) = @_; 585 my ($pl, $path) = @_;
412 586
413 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_) 587 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
414 for grep %$_, all_objects $ob; 588 for grep %$_, all_objects $pl->ob;
415}; 589 },
590;
416 591
417############################################################################# 592#############################################################################
418# core extensions - in perl 593# core extensions - in perl
419 594
420=item cf::player::exists $login 595=item cf::player::exists $login
… …
466} 641}
467 642
468############################################################################# 643#############################################################################
469# map scripting support 644# map scripting support
470 645
471our $safe = new Safe "ext"; 646our $safe = new Safe "safe";
472our $safe_hole = new Safe::Hole; 647our $safe_hole = new Safe::Hole;
473 648
474$SIG{FPE} = 'IGNORE'; 649$SIG{FPE} = 'IGNORE';
475 650
476$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 651$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
… …
482 ["cf::object::player" => qw(player)], 657 ["cf::object::player" => qw(player)],
483 ["cf::player" => qw(peaceful)], 658 ["cf::player" => qw(peaceful)],
484) { 659) {
485 no strict 'refs'; 660 no strict 'refs';
486 my ($pkg, @funs) = @$_; 661 my ($pkg, @funs) = @$_;
487 *{"ext::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 662 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
488 for @funs; 663 for @funs;
489} 664}
490 665
491sub safe_eval($;@) { 666sub safe_eval($;@) {
492 my ($code, %vars) = @_; 667 my ($code, %vars) = @_;
… …
494 my $qcode = $code; 669 my $qcode = $code;
495 $qcode =~ s/"/‟/g; # not allowed in #line filenames 670 $qcode =~ s/"/‟/g; # not allowed in #line filenames
496 $qcode =~ s/\n/\\n/g; 671 $qcode =~ s/\n/\\n/g;
497 672
498 local $_; 673 local $_;
499 local @ext::cf::_safe_eval_args = values %vars; 674 local @safe::cf::_safe_eval_args = values %vars;
500 675
501 $code = 676 my $eval =
502 "do {\n" 677 "do {\n"
503 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 678 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
504 . "#line 0 \"{$qcode}\"\n" 679 . "#line 0 \"{$qcode}\"\n"
505 . $code 680 . $code
506 . "\n}" 681 . "\n}"
507 ; 682 ;
508 683
509 sub_generation_inc; 684 sub_generation_inc;
510 my @res = wantarray ? $safe->reval ($code) : scalar $safe->reval ($code); 685 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
511 sub_generation_inc; 686 sub_generation_inc;
687
688 if ($@) {
689 warn "$@";
690 warn "while executing safe code '$code'\n";
691 warn "with arguments " . (join " ", %vars) . "\n";
692 }
512 693
513 wantarray ? @res : $res[0] 694 wantarray ? @res : $res[0]
514} 695}
515 696
516sub register_script_function { 697sub register_script_function {
517 my ($fun, $cb) = @_; 698 my ($fun, $cb) = @_;
518 699
519 no strict 'refs'; 700 no strict 'refs';
520 *{"ext::$fun"} = $safe_hole->wrap ($cb); 701 *{"safe::$fun"} = $safe_hole->wrap ($cb);
521} 702}
522 703
523############################################################################# 704#############################################################################
524# the server's main() 705# the server's main()
525 706
526sub run { 707sub main {
527 Event::loop; 708 Event::loop;
528} 709}
529 710
530############################################################################# 711#############################################################################
531# initialisation 712# initialisation
… …
543 cf::server_tick; # one server iteration 724 cf::server_tick; # one server iteration
544 725
545 my $NOW = Event::time; 726 my $NOW = Event::time;
546 $NEXT_TICK += $TICK; 727 $NEXT_TICK += $TICK;
547 728
548 # if we are delayed by > 0.25 second, skip ticks 729 # if we are delayed by four ticks, skip them all
549 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + .25; 730 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
550 731
551 $TICK_WATCHER->at ($NEXT_TICK); 732 $TICK_WATCHER->at ($NEXT_TICK);
552 $TICK_WATCHER->start; 733 $TICK_WATCHER->start;
553 }, 734 },
554); 735);

Diff Legend

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