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.29 by root, Wed Aug 9 10:57:28 2006 UTC vs.
Revision 1.39 by root, Fri Aug 25 13:24:50 2006 UTC

… …
5use Storable; 5use Storable;
6use Opcode; 6use Opcode;
7use Safe; 7use Safe;
8use Safe::Hole; 8use Safe::Hole;
9 9
10use Time::HiRes;
10use Event; 11use Event;
11$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
12 13
13use strict; 14use strict;
14 15
15our %COMMAND; 16our %COMMAND = ();
16our @EVENT; 17our @EVENT;
18our @PLUGIN_EVENT;
17our %PROP_TYPE; 19our %PROP_TYPE;
18our %PROP_IDX; 20our %PROP_IDX;
19our $LIBDIR = maps_directory "perl"; 21our $LIBDIR = maps_directory "perl";
20 22
23our $TICK = MAX_TIME * 1e-6;
24our $TICK_WATCHER;
25our $NEXT_TICK;
26
21BEGIN { 27BEGIN {
22 @EVENT = map lc, @EVENT; 28 @PLUGIN_EVENT = map lc, @PLUGIN_EVENT;
23 29
24 *CORE::GLOBAL::warn = sub { 30 *CORE::GLOBAL::warn = sub {
25 my $msg = join "", @_; 31 my $msg = join "", @_;
26 $msg .= "\n" 32 $msg .= "\n"
27 unless $msg =~ /\n$/; 33 unless $msg =~ /\n$/;
… …
70@ext::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 76@ext::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
71@ext::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object'; 77@ext::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object';
72 78
73# we bless all objects into derived classes to force a method lookup 79# we bless all objects into derived classes to force a method lookup
74# within the Safe compartment. 80# within the Safe compartment.
75for my $pkg (qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region)) { 81for my $pkg (qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region cf::arch)) {
76 no strict 'refs'; 82 no strict 'refs';
77 @{"ext::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 83 @{"ext::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
78} 84}
79 85
80$Event::DIED = sub { 86$Event::DIED = sub {
… …
85my @exts; 91my @exts;
86my @hook; 92my @hook;
87my %command; 93my %command;
88my %extcmd; 94my %extcmd;
89 95
96#############################################################################
97# "new" plug-in system
98
99=item cf::object::attach ... # NYI
100
101=item cf::attach_global ... # NYI
102
103=item cf::attach_to_type ... # NYI
104
105=item cf::attach_to_objects ... # NYI
106
107=item cf::attach_to_players ... # NYI
108
109=item cf::attach_to_maps ... # NYI
110
111 prio => $number, # higehr is earlier
112 on_xxx => \&cb,
113 package => package::,
114
115=cut
116
117our %CB_CLASS = (); # registry for class-based events
118our @CB_GLOBAL = (); # registry for all global events
119our @CB_TYPE = (); # registry for type (cf-object class) based events
120
121sub _attach_cb($\%$$$) {
122 my ($registry, $undo, $event, $prio, $cb) = @_;
123
124 use sort 'stable';
125
126 $cb = [$prio, $cb];
127
128 @{$registry->[$event]} = sort
129 { $a->[0] cmp $b->[0] }
130 @{$registry->[$event] || []}, $cb;
131
132 push @{$undo->{cb}}, [$event, $cb];
133}
134
135# attach handles attaching event callbacks
136# the only thing the caller has to do is pass the correct
137# registry (== where the callback attaches to).
138sub _attach(\@$\@) {
139 my ($registry, $klass, $arg) = @_;
140
141 my $prio = 0;
142
143 my %undo = (
144 registry => $registry,
145 cb => [],
146 );
147
148 my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
149
150 while (@$arg) {
151 my $type = shift @$arg;
152
153 if ($type eq "prio") {
154 $prio = shift @$arg;
155
156 } elsif ($type eq "package") {
157 my $pkg = shift @$arg;
158
159 while (my ($name, $id) = each %cb_id) {
160 if (my $cb = $pkg->can ($name)) {
161 _attach_cb $registry, %undo, $id, $prio, $cb;
162 }
163 }
164
165 } elsif (exists $cb_id{$type}) {
166 _attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @$arg;
167
168 } elsif (ref $type) {
169 warn "attaching objects not supported, ignoring.\n";
170
171 } else {
172 shift @$arg;
173 warn "attach argument '$type' not supported, ignoring.\n";
174 }
175 }
176
177 \%undo
178}
179
180sub cf::object::attach {
181 die;
182}
183
184sub attach_global {
185 _attach @CB_GLOBAL, KLASS_GLOBAL, @_
186}
187
188sub attach_type {
189 my $type = shift;
190 _attach @{$CB_TYPE[$type]}, KLASS_MAP, @_
191}
192
193sub attach_to_objects {
194 _attach @{$CB_CLASS{cf::object::wrap::}}, KLASS_OBJECT, @_
195}
196
197sub attach_to_players {
198 _attach @{$CB_CLASS{cf::player::wrap::}}, KLASS_PLAYER, @_
199}
200
201sub attach_to_maps {
202 _attach @{$CB_CLASS{cf::map::wrap::}}, KLASS_MAP, @_
203}
204
205our $override;
206
207sub override() {
208 $override = 1
209}
210
211sub invoke {
212 my $event = shift;
213
214 my @cb;
215
216 if (my $ref = ref $_[0]) {
217 # 1. object-specific (NYI)
218 # 2. class-specific
219 push @cb, @{$CB_CLASS{$ref}[$event] || []};
220 }
221
222 # global
223 push @cb, @{$CB_GLOBAL[$event] || []};
224
225# warn "invoke id $EVENT[$event][0], args <@_> <=> @cb\n";#d#
226
227 local $override;
228
229 for (@cb) {
230 eval { &{$_->[1]} };
231
232 if ($@) {
233 warn "$@";
234 warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n";
235 override;
236 }
237
238 return 1 if $override;
239 }
240
241 0
242}
243
244#############################################################################
245# old plug-in events
246
90sub inject_event { 247sub inject_event {
91 my $extension = shift; 248 my $extension = shift;
92 my $event_code = shift; 249 my $event_code = shift;
93 250
94 my $cb = $hook[$event_code]{$extension} 251 my $cb = $hook[$event_code]{$extension}
… …
136} 293}
137 294
138sub register { 295sub register {
139 my ($base, $pkg) = @_; 296 my ($base, $pkg) = @_;
140 297
141 for my $idx (0 .. $#EVENT) { 298 for my $idx (0 .. $#PLUGIN_EVENT) {
142 if (my $ref = $pkg->can ("on_$EVENT[$idx]")) { 299 if (my $ref = $pkg->can ("on_$PLUGIN_EVENT[$idx]")) {
143 #warn "registering $EVENT[$idx] hook to '$pkg'\n"; 300 #warn "registering $PLUGIN_EVENT[$idx] hook to '$pkg'\n";
144 $hook[$idx]{$base} = $ref; 301 $hook[$idx]{$base} = $ref;
145 } 302 }
146 } 303 }
147} 304}
148 305
… …
181sub unload_extension { 338sub unload_extension {
182 my ($pkg) = @_; 339 my ($pkg) = @_;
183 340
184 warn "removing extension $pkg\n"; 341 warn "removing extension $pkg\n";
185 342
186 if (my $cb = $pkg->can ("on_unload")) {
187 $cb->($pkg);
188 }
189
190 # remove hooks 343 # remove hooks
191 for my $idx (0 .. $#EVENT) { 344 for my $idx (0 .. $#PLUGIN_EVENT) {
192 delete $hook[$idx]{$pkg}; 345 delete $hook[$idx]{$pkg};
193 } 346 }
194 347
195 # remove commands 348 # remove commands
196 for my $name (keys %command) { 349 for my $name (keys %command) {
… …
208 # remove extcmds 361 # remove extcmds
209 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 362 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
210 delete $extcmd{$name}; 363 delete $extcmd{$name};
211 } 364 }
212 365
366 if (my $cb = $pkg->can ("on_unload")) {
367 eval {
368 $cb->($pkg);
369 1
370 } or warn "$pkg unloaded, but with errors: $@";
371 }
372
213 Symbol::delete_package $pkg; 373 Symbol::delete_package $pkg;
214} 374}
215 375
216sub load_extensions { 376sub load_extensions {
217 my $LIBDIR = maps_directory "perl"; 377 my $LIBDIR = maps_directory "perl";
… …
223 1 383 1
224 } or warn "$ext not loaded: $@"; 384 } or warn "$ext not loaded: $@";
225 } 385 }
226} 386}
227 387
388sub _perl_reload(&) {
389 my ($msg) = @_;
390
391 $msg->("reloading...");
392
393 eval {
394 # 1. cancel all watchers
395 $_->cancel for Event::all_watchers;
396
397 # 2. unload all extensions
398 for (@exts) {
399 $msg->("unloading <$_>");
400 unload_extension $_;
401 }
402
403 # 3. unload all modules loaded from $LIBDIR
404 while (my ($k, $v) = each %INC) {
405 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
406
407 $msg->("removing <$k>");
408 delete $INC{$k};
409
410 $k =~ s/\.pm$//;
411 $k =~ s/\//::/g;
412
413 if (my $cb = $k->can ("unload_module")) {
414 $cb->();
415 }
416
417 Symbol::delete_package $k;
418 }
419
420 # 4. get rid of ext::, as good as possible
421 Symbol::delete_package "ext::$_"
422 for qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region);
423
424 # 5. remove register_script_function callbacks
425 # TODO
426
427 # 6. unload cf.pm "a bit"
428 delete $INC{"cf.pm"};
429
430 # don't, removes xs symbols, too
431 #Symbol::delete_package __PACKAGE__;
432
433 # 7. reload cf.pm
434 $msg->("reloading cf.pm");
435 require cf;
436 };
437 $msg->($@) if $@;
438
439 $msg->("reloaded");
440};
441
442sub perl_reload() {
443 _perl_reload {
444 warn $_[0];
445 print "$_[0]\n";
446 };
447}
448
228register_command "perl-reload", 0, sub { 449register_command "perl-reload", 0, sub {
229 my ($who, $arg) = @_; 450 my ($who, $arg) = @_;
230 451
231 if ($who->flag (FLAG_WIZ)) { 452 if ($who->flag (FLAG_WIZ)) {
232 $who->message ("reloading..."); 453 _perl_reload {
233 454 warn $_[0];
234 warn "reloading...\n"; 455 $who->message ($_[0]);
235 eval {
236 # 1. cancel all watchers
237 $_->cancel for Event::all_watchers;
238
239 # 2. unload all extensions
240 for (@exts) {
241 $who->message ("unloading <$_>");
242 unload_extension $_;
243 }
244
245 # 3. unload all modules loaded from $LIBDIR
246 while (my ($k, $v) = each %INC) {
247 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
248
249 $who->message ("removing <$k>");
250 delete $INC{$k};
251
252 $k =~ s/\.pm$//;
253 $k =~ s/\//::/g;
254
255 if (my $cb = $k->can ("unload_module")) {
256 $cb->();
257 }
258
259 Symbol::delete_package $k;
260 }
261
262 # 4. get rid of ext::, as good as possible
263 Symbol::delete_package "ext::$_"
264 for qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region);
265
266 # 5. remove register_script_function callbacks
267 # TODO
268
269 # 6. unload cf.pm "a bit"
270 delete $INC{"cf.pm"};
271
272 # don't, removes xs symbols, too
273 #Symbol::delete_package __PACKAGE__;
274
275 # 7. reload cf.pm
276 $who->message ("reloading cf.pm");
277 require cf;
278 }; 456 };
279 warn $@ if $@;
280 $who->message ($@) if $@;
281 warn "reloaded\n";
282
283 $who->message ("reloaded");
284 } else {
285 $who->message ("Intruder Alert!");
286 } 457 }
287}; 458};
288 459
289############################################################################# 460#############################################################################
290# utility functions 461# utility functions
… …
324} 495}
325 496
326############################################################################# 497#############################################################################
327# load/save/clean perl data associated with a map 498# load/save/clean perl data associated with a map
328 499
329*on_mapclean = sub { 500*cf::mapsupport::on_clean = sub {
330 my ($map) = @_; 501 my ($map) = @_;
331 502
332 my $path = $map->tmpname; 503 my $path = $map->tmpname;
333 defined $path or return; 504 defined $path or return;
334 505
335 unlink "$path.cfperl"; 506 unlink "$path.cfperl";
336}; 507};
337 508
338*on_mapin = 509*cf::mapsupport::on_swapin =
339*on_mapload = sub { 510*cf::mapsupport::on_load = sub {
340 my ($map) = @_; 511 my ($map) = @_;
341 512
342 my $path = $map->tmpname; 513 my $path = $map->tmpname;
343 $path = $map->path unless defined $path; 514 $path = $map->path unless defined $path;
344 515
… …
351 or return; # too new 522 or return; # too new
352 523
353 $map->_set_obs ($data->{obs}); 524 $map->_set_obs ($data->{obs});
354}; 525};
355 526
356*on_mapout = sub { 527*cf::mapsupport::on_swapout = sub {
357 my ($map) = @_; 528 my ($map) = @_;
358 529
359 my $path = $map->tmpname; 530 my $path = $map->tmpname;
360 $path = $map->path unless defined $path; 531 $path = $map->path unless defined $path;
361 532
… …
378 } else { 549 } else {
379 unlink "$path.cfperl"; 550 unlink "$path.cfperl";
380 } 551 }
381}; 552};
382 553
554attach_to_maps prio => -10000, package => cf::mapsupport::;
555
383############################################################################# 556#############################################################################
384# load/save perl data associated with player->ob objects 557# load/save perl data associated with player->ob objects
385 558
386*on_player_load = sub { 559sub all_objects(@) {
560 @_, map all_objects ($_->inv), @_
561}
562
563attach_to_players
564 on_load => sub {
387 my ($ob, $path) = @_; 565 my ($pl, $path) = @_;
388 566
389 for my $o ($ob, $ob->inv) { 567 for my $o (all_objects $pl->ob) {
390 if (my $value = $o->get_ob_key_value ("_perl_data")) { 568 if (my $value = $o->get_ob_key_value ("_perl_data")) {
391 $o->set_ob_key_value ("_perl_data"); 569 $o->set_ob_key_value ("_perl_data");
392 570
393 %$o = %{ Storable::thaw pack "H*", $value }; 571 %$o = %{ Storable::thaw pack "H*", $value };
572 }
394 } 573 }
395 } 574 },
396}; 575 on_save => sub {
397
398*on_player_save = sub {
399 my ($ob, $path) = @_; 576 my ($pl, $path) = @_;
400 577
401 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_) 578 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
402 for grep %$_, $ob, $ob->inv; 579 for grep %$_, all_objects $pl->ob;
403}; 580 },
581;
404 582
405############################################################################# 583#############################################################################
406# core extensions - in perl 584# core extensions - in perl
407 585
408=item cf::player::exists $login 586=item cf::player::exists $login
… …
507 no strict 'refs'; 685 no strict 'refs';
508 *{"ext::$fun"} = $safe_hole->wrap ($cb); 686 *{"ext::$fun"} = $safe_hole->wrap ($cb);
509} 687}
510 688
511############################################################################# 689#############################################################################
690# the server's main()
691
692sub main {
693 Event::loop;
694}
695
696#############################################################################
512# initialisation 697# initialisation
513 698
514register "<global>", __PACKAGE__; 699register "<global>", __PACKAGE__;
515 700
516unshift @INC, $LIBDIR; 701unshift @INC, $LIBDIR;
517 702
518load_extensions; 703load_extensions;
519 704
705$TICK_WATCHER = Event->timer (
706 prio => 1,
707 at => $NEXT_TICK || 1,
708 cb => sub {
709 cf::server_tick; # one server iteration
710
711 my $NOW = Event::time;
712 $NEXT_TICK += $TICK;
713
714 # if we are delayed by four ticks, skip them all
715 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
716
717 $TICK_WATCHER->at ($NEXT_TICK);
718 $TICK_WATCHER->start;
719 },
720);
721
5201 7221
521 723

Diff Legend

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