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.34 by root, Thu Aug 24 13:13:49 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 %PROP_TYPE; 19our %PROP_TYPE;
19our %PROP_IDX; 20our %PROP_IDX;
20our $LIBDIR = maps_directory "perl"; 21our $LIBDIR = maps_directory "perl";
21 22
23our $TICK = MAX_TIME * 1e-6;
24our $TICK_WATCHER;
25our $NEXT_TICK;
26
22BEGIN { 27BEGIN {
23 @EVENT = map lc, @EVENT; 28 @PLUGIN_EVENT = map lc, @PLUGIN_EVENT;
24 29
25 *CORE::GLOBAL::warn = sub { 30 *CORE::GLOBAL::warn = sub {
26 my $msg = join "", @_; 31 my $msg = join "", @_;
27 $msg .= "\n" 32 $msg .= "\n"
28 unless $msg =~ /\n$/; 33 unless $msg =~ /\n$/;
… …
66prop_gen MAP_PROP => "cf::map"; 71prop_gen MAP_PROP => "cf::map";
67prop_gen ARCH_PROP => "cf::arch"; 72prop_gen ARCH_PROP => "cf::arch";
68 73
69# guessed hierarchies 74# guessed hierarchies
70 75
71@ext::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 76@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
72@ext::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object'; 77@safe::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object';
73 78
74# 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
75# within the Safe compartment. 80# within the Safe compartment.
76for 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)) {
77 no strict 'refs'; 82 no strict 'refs';
78 @{"ext::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 83 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
79} 84}
80 85
81$Event::DIED = sub { 86$Event::DIED = sub {
82 warn "error in event callback: @_"; 87 warn "error in event callback: @_";
83}; 88};
… …
86my @exts; 91my @exts;
87my @hook; 92my @hook;
88my %command; 93my %command;
89my %extcmd; 94my %extcmd;
90 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
91sub inject_event { 238sub inject_event {
92 my $extension = shift; 239 my $extension = shift;
93 my $event_code = shift; 240 my $event_code = shift;
94 241
95 my $cb = $hook[$event_code]{$extension} 242 my $cb = $hook[$event_code]{$extension}
… …
137} 284}
138 285
139sub register { 286sub register {
140 my ($base, $pkg) = @_; 287 my ($base, $pkg) = @_;
141 288
142 for my $idx (0 .. $#EVENT) { 289 for my $idx (0 .. $#PLUGIN_EVENT) {
143 if (my $ref = $pkg->can ("on_$EVENT[$idx]")) { 290 if (my $ref = $pkg->can ("on_$PLUGIN_EVENT[$idx]")) {
144 #warn "registering $EVENT[$idx] hook to '$pkg'\n"; 291 #warn "registering $PLUGIN_EVENT[$idx] hook to '$pkg'\n";
145 $hook[$idx]{$base} = $ref; 292 $hook[$idx]{$base} = $ref;
146 } 293 }
147 } 294 }
148} 295}
149 296
… …
152 299
153 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 300 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
154 my $base = $1; 301 my $base = $1;
155 my $pkg = $1; 302 my $pkg = $1;
156 $pkg =~ s/[^[:word:]]/_/g; 303 $pkg =~ s/[^[:word:]]/_/g;
157 $pkg = "cf::ext::$pkg"; 304 $pkg = "ext::$pkg";
158 305
159 warn "loading '$path' into '$pkg'\n"; 306 warn "loading '$path' into '$pkg'\n";
160 307
161 open my $fh, "<:utf8", $path 308 open my $fh, "<:utf8", $path
162 or die "$path: $!"; 309 or die "$path: $!";
… …
183 my ($pkg) = @_; 330 my ($pkg) = @_;
184 331
185 warn "removing extension $pkg\n"; 332 warn "removing extension $pkg\n";
186 333
187 # remove hooks 334 # remove hooks
188 for my $idx (0 .. $#EVENT) { 335 for my $idx (0 .. $#PLUGIN_EVENT) {
189 delete $hook[$idx]{$pkg}; 336 delete $hook[$idx]{$pkg};
190 } 337 }
191 338
192 # remove commands 339 # remove commands
193 for my $name (keys %command) { 340 for my $name (keys %command) {
… …
227 1 374 1
228 } or warn "$ext not loaded: $@"; 375 } or warn "$ext not loaded: $@";
229 } 376 }
230} 377}
231 378
379sub _perl_reload(&) {
380 my ($msg) = @_;
381
382 $msg->("reloading...");
383
384 eval {
385 # 1. cancel all watchers
386 $_->cancel for Event::all_watchers;
387
388 # 2. unload all extensions
389 for (@exts) {
390 $msg->("unloading <$_>");
391 unload_extension $_;
392 }
393
394 # 3. unload all modules loaded from $LIBDIR
395 while (my ($k, $v) = each %INC) {
396 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
397
398 $msg->("removing <$k>");
399 delete $INC{$k};
400
401 $k =~ s/\.pm$//;
402 $k =~ s/\//::/g;
403
404 if (my $cb = $k->can ("unload_module")) {
405 $cb->();
406 }
407
408 Symbol::delete_package $k;
409 }
410
411 # 4. get rid of safe::, as good as possible
412 Symbol::delete_package "safe::$_"
413 for qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region);
414
415 # 5. remove register_script_function callbacks
416 # TODO
417
418 # 6. unload cf.pm "a bit"
419 delete $INC{"cf.pm"};
420
421 # don't, removes xs symbols, too,
422 # and global variables created in xs
423 #Symbol::delete_package __PACKAGE__;
424
425 # 7. reload cf.pm
426 $msg->("reloading cf.pm");
427 require cf;
428 };
429 $msg->($@) if $@;
430
431 $msg->("reloaded");
432};
433
434sub perl_reload() {
435 _perl_reload {
436 warn $_[0];
437 print "$_[0]\n";
438 };
439}
440
232register_command "perl-reload", 0, sub { 441register_command "perl-reload", 0, sub {
233 my ($who, $arg) = @_; 442 my ($who, $arg) = @_;
234 443
235 if ($who->flag (FLAG_WIZ)) { 444 if ($who->flag (FLAG_WIZ)) {
236 $who->message ("reloading..."); 445 _perl_reload {
237 446 warn $_[0];
238 warn "reloading...\n"; 447 $who->message ($_[0]);
239 eval {
240 # 1. cancel all watchers
241 $_->cancel for Event::all_watchers;
242
243 # 2. unload all extensions
244 for (@exts) {
245 $who->message ("unloading <$_>");
246 unload_extension $_;
247 }
248
249 # 3. unload all modules loaded from $LIBDIR
250 while (my ($k, $v) = each %INC) {
251 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
252
253 $who->message ("removing <$k>");
254 delete $INC{$k};
255
256 $k =~ s/\.pm$//;
257 $k =~ s/\//::/g;
258
259 if (my $cb = $k->can ("unload_module")) {
260 $cb->();
261 }
262
263 Symbol::delete_package $k;
264 }
265
266 # 4. get rid of ext::, as good as possible
267 Symbol::delete_package "ext::$_"
268 for qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region);
269
270 # 5. remove register_script_function callbacks
271 # TODO
272
273 # 6. unload cf.pm "a bit"
274 delete $INC{"cf.pm"};
275
276 # don't, removes xs symbols, too
277 #Symbol::delete_package __PACKAGE__;
278
279 # 7. reload cf.pm
280 $who->message ("reloading cf.pm");
281 require cf;
282 }; 448 };
283 warn $@ if $@;
284 $who->message ($@) if $@;
285 warn "reloaded\n";
286
287 $who->message ("reloaded");
288 } else {
289 $who->message ("Intruder Alert!");
290 } 449 }
291}; 450};
292 451
293############################################################################# 452#############################################################################
294# utility functions 453# utility functions
… …
328} 487}
329 488
330############################################################################# 489#############################################################################
331# load/save/clean perl data associated with a map 490# load/save/clean perl data associated with a map
332 491
333*on_mapclean = sub { 492*cf::mapsupport::on_clean = sub {
334 my ($map) = @_; 493 my ($map) = @_;
335 494
336 my $path = $map->tmpname; 495 my $path = $map->tmpname;
337 defined $path or return; 496 defined $path or return;
338 497
339 unlink "$path.cfperl"; 498 unlink "$path.cfperl";
340}; 499};
341 500
342*on_mapin = 501*cf::mapsupport::on_swapin =
343*on_mapload = sub { 502*cf::mapsupport::on_load = sub {
344 my ($map) = @_; 503 my ($map) = @_;
345 504
346 my $path = $map->tmpname; 505 my $path = $map->tmpname;
347 $path = $map->path unless defined $path; 506 $path = $map->path unless defined $path;
348 507
… …
355 or return; # too new 514 or return; # too new
356 515
357 $map->_set_obs ($data->{obs}); 516 $map->_set_obs ($data->{obs});
358}; 517};
359 518
360*on_mapout = sub { 519*cf::mapsupport::on_swapout = sub {
361 my ($map) = @_; 520 my ($map) = @_;
362 521
363 my $path = $map->tmpname; 522 my $path = $map->tmpname;
364 $path = $map->path unless defined $path; 523 $path = $map->path unless defined $path;
365 524
… …
382 } else { 541 } else {
383 unlink "$path.cfperl"; 542 unlink "$path.cfperl";
384 } 543 }
385}; 544};
386 545
546attach_to_maps prio => -10000, package => cf::mapsupport::;
547
387############################################################################# 548#############################################################################
388# load/save perl data associated with player->ob objects 549# load/save perl data associated with player->ob objects
389 550
390sub all_objects(@) { 551sub all_objects(@) {
391 @_, map all_objects ($_->inv), @_ 552 @_, map all_objects ($_->inv), @_
392} 553}
393 554
394*on_player_load = sub { 555attach_to_players
556 on_load => sub {
395 my ($ob, $path) = @_; 557 my ($pl, $path) = @_;
396 558
397 for my $o (all_objects $ob) { 559 for my $o (all_objects $pl->ob) {
398 if (my $value = $o->get_ob_key_value ("_perl_data")) { 560 if (my $value = $o->get_ob_key_value ("_perl_data")) {
399 $o->set_ob_key_value ("_perl_data"); 561 $o->set_ob_key_value ("_perl_data");
400 562
401 %$o = %{ Storable::thaw pack "H*", $value }; 563 %$o = %{ Storable::thaw pack "H*", $value };
564 }
402 } 565 }
403 } 566 },
404}; 567 on_save => sub {
405
406*on_player_save = sub {
407 my ($ob, $path) = @_; 568 my ($pl, $path) = @_;
408 569
409 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_) 570 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
410 for grep %$_, all_objects $ob; 571 for grep %$_, all_objects $pl->ob;
411}; 572 },
573;
412 574
413############################################################################# 575#############################################################################
414# core extensions - in perl 576# core extensions - in perl
415 577
416=item cf::player::exists $login 578=item cf::player::exists $login
… …
478 ["cf::object::player" => qw(player)], 640 ["cf::object::player" => qw(player)],
479 ["cf::player" => qw(peaceful)], 641 ["cf::player" => qw(peaceful)],
480) { 642) {
481 no strict 'refs'; 643 no strict 'refs';
482 my ($pkg, @funs) = @$_; 644 my ($pkg, @funs) = @$_;
483 *{"ext::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 645 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
484 for @funs; 646 for @funs;
485} 647}
486 648
487sub safe_eval($;@) { 649sub safe_eval($;@) {
488 my ($code, %vars) = @_; 650 my ($code, %vars) = @_;
… …
490 my $qcode = $code; 652 my $qcode = $code;
491 $qcode =~ s/"/‟/g; # not allowed in #line filenames 653 $qcode =~ s/"/‟/g; # not allowed in #line filenames
492 $qcode =~ s/\n/\\n/g; 654 $qcode =~ s/\n/\\n/g;
493 655
494 local $_; 656 local $_;
495 local @ext::cf::_safe_eval_args = values %vars; 657 local @safe::cf::_safe_eval_args = values %vars;
496 658
497 $code = 659 $code =
498 "do {\n" 660 "do {\n"
499 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 661 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
500 . "#line 0 \"{$qcode}\"\n" 662 . "#line 0 \"{$qcode}\"\n"
… …
511 673
512sub register_script_function { 674sub register_script_function {
513 my ($fun, $cb) = @_; 675 my ($fun, $cb) = @_;
514 676
515 no strict 'refs'; 677 no strict 'refs';
516 *{"ext::$fun"} = $safe_hole->wrap ($cb); 678 *{"safe::$fun"} = $safe_hole->wrap ($cb);
517} 679}
518 680
519############################################################################# 681#############################################################################
520# the server's main() 682# the server's main()
521 683
522sub run { 684sub main {
523 my $tick = MAX_TIME * 1e-6; 685 Event::loop;
524 my $next = Event::time; 686}
525 my $timer = Event->timer (at => $next, cb => sub { 687
688#############################################################################
689# initialisation
690
691register "<global>", __PACKAGE__;
692
693unshift @INC, $LIBDIR;
694
695load_extensions;
696
697$TICK_WATCHER = Event->timer (
698 prio => 1,
699 at => $NEXT_TICK || 1,
700 cb => sub {
526 cf::server_tick; # one server iteration 701 cf::server_tick; # one server iteration
527 702
528 $next += $tick;
529 my $NOW = Event::time; 703 my $NOW = Event::time;
704 $NEXT_TICK += $TICK;
530 705
531 # if we are delayd by > 0.25 second, skip ticks 706 # if we are delayed by four ticks, skip them all
532 $next = $NOW if $NOW >= $next + .25; 707 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
533 708
534 $_[0]->w->at ($next); 709 $TICK_WATCHER->at ($NEXT_TICK);
535 $_[0]->w->start; 710 $TICK_WATCHER->start;
536 }); 711 },
537 712);
538 Event::loop;
539}
540
541#############################################################################
542# initialisation
543
544register "<global>", __PACKAGE__;
545
546unshift @INC, $LIBDIR;
547
548load_extensions;
549 713
5501 7141
551 715

Diff Legend

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