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.51 by root, Mon Aug 28 14:05:24 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
16_reload_1;
17
16our %COMMAND; 18our %COMMAND = ();
17our @EVENT; 19our @EVENT;
18our %PROP_TYPE; 20our %PROP_TYPE;
19our %PROP_IDX; 21our %PROP_IDX;
20our $LIBDIR = maps_directory "perl"; 22our $LIBDIR = maps_directory "perl";
21 23
22our $TICK = MAX_TIME * 1e-6; 24our $TICK = MAX_TIME * 1e-6;
23our $TICK_WATCHER; 25our $TICK_WATCHER;
24our $NEXT_TICK; 26our $NEXT_TICK;
25 27
26BEGIN { 28BEGIN {
27 @EVENT = map lc, @EVENT;
28
29 *CORE::GLOBAL::warn = sub { 29 *CORE::GLOBAL::warn = sub {
30 my $msg = join "", @_; 30 my $msg = join "", @_;
31 $msg .= "\n" 31 $msg .= "\n"
32 unless $msg =~ /\n$/; 32 unless $msg =~ /\n$/;
33 33
68prop_gen PLAYER_PROP => "cf::object::player"; 68prop_gen PLAYER_PROP => "cf::object::player";
69 69
70prop_gen MAP_PROP => "cf::map"; 70prop_gen MAP_PROP => "cf::map";
71prop_gen ARCH_PROP => "cf::arch"; 71prop_gen ARCH_PROP => "cf::arch";
72 72
73# guessed hierarchies
74
75@ext::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 73@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
76@ext::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object';
77 74
78# we bless all objects into derived classes to force a method lookup 75# we bless all objects into (empty) derived classes to force a method lookup
79# within the Safe compartment. 76# 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)) { 77for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch cf::living)) {
81 no strict 'refs'; 78 no strict 'refs';
82 @{"ext::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 79 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
83} 80}
84 81
85$Event::DIED = sub { 82$Event::DIED = sub {
86 warn "error in event callback: @_"; 83 warn "error in event callback: @_";
87}; 84};
90my @exts; 87my @exts;
91my @hook; 88my @hook;
92my %command; 89my %command;
93my %extcmd; 90my %extcmd;
94 91
92#############################################################################
93# utility functions
94
95use JSON::Syck (); # TODO# replace by JSON::PC once working
96
97sub from_json($) {
98 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
99 JSON::Syck::Load $_[0]
100}
101
102sub to_json($) {
103 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
104 JSON::Syck::Dump $_[0]
105}
106
107#############################################################################
108# "new" plug-in system
109
110=item $object->attach ($attachment, key => $value...)
111
112Attach a pre-registered attachment to an object.
113
114=item $player->attach ($attachment, key => $value...)
115
116Attach a pre-registered attachment to a player.
117
118=item $map->attach ($attachment, key => $value...) # not yet persistent
119
120Attach a pre-registered attachment to a map.
121
122=item cf::attach_global ...
123
124Attach handlers for global events.
125
126This and all following C<attach_*>-functions expect any number of the
127following handler/hook descriptions:
128
129=over 4
130
131=item prio => $number
132
133Set the priority for all following handlers/hooks (unless overwritten
134by another C<prio> setting). Lower priority handlers get executed
135earlier. The default priority is C<0>, and many built-in handlers are
136registered at priority C<-1000>, so lower priorities should not be used
137unless you know what you are doing.
138
139=item on_I<event> => \&cb
140
141Call the given code reference whenever the named event happens (event is
142something like C<instantiate>, C<apply>, C<use_skill> and so on, and which
143handlers are recognised generally depends on the type of object these
144handlers attach to).
145
146See F<include/eventinc.h> for the full list of events supported, and their
147class.
148
149=item package => package::
150
151Look for sub functions of the name C<< on_I<event> >> in the given
152package and register them. Only handlers for eevents supported by the
153object/class are recognised.
154
155=back
156
157=item cf::attach_to_type $object_type, $subtype, ...
158
159Attach handlers for a specific object type (e.g. TRANSPORT) and
160subtype. If C<$subtype> is zero or undef, matches all objects of the given
161type.
162
163=item cf::attach_to_objects ...
164
165Attach handlers to all objects. Do not use this except for debugging or
166very rare events, as handlers are (obviously) called for I<all> objects in
167the game.
168
169=item cf::attach_to_players ...
170
171Attach handlers to all players.
172
173=item cf::attach_to_maps ...
174
175Attach handlers to all maps.
176
177=item cf:register_attachment $name, ...
178
179=cut
180
181# the following variables are defined in .xs and must not be re-created
182our @CB_GLOBAL = (); # registry for all global events
183our @CB_OBJECT = (); # all objects (should not be used except in emergency)
184our @CB_PLAYER = ();
185our @CB_TYPE = (); # registry for type (cf-object class) based events
186our @CB_MAP = ();
187
188my %attachment;
189
190sub _attach_cb($\%$$$) {
191 my ($registry, $undo, $event, $prio, $cb) = @_;
192
193 use sort 'stable';
194
195 $cb = [$prio, $cb];
196
197 @{$registry->[$event]} = sort
198 { $a->[0] cmp $b->[0] }
199 @{$registry->[$event] || []}, $cb;
200
201 push @{$undo->{cb}}, [$event, $cb];
202}
203
204# attach handles attaching event callbacks
205# the only thing the caller has to do is pass the correct
206# registry (== where the callback attaches to).
207sub _attach(\@$@) {
208 my ($registry, $klass, @arg) = @_;
209
210 my $prio = 0;
211
212 my %undo = (
213 registry => $registry,
214 cb => [],
215 );
216
217 my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
218
219 while (@arg) {
220 my $type = shift @arg;
221
222 if ($type eq "prio") {
223 $prio = shift @arg;
224
225 } elsif ($type eq "package") {
226 my $pkg = shift @arg;
227
228 while (my ($name, $id) = each %cb_id) {
229 if (my $cb = $pkg->can ($name)) {
230 _attach_cb $registry, %undo, $id, $prio, $cb;
231 }
232 }
233
234 } elsif (exists $cb_id{$type}) {
235 _attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @arg;
236
237 } elsif (ref $type) {
238 warn "attaching objects not supported, ignoring.\n";
239
240 } else {
241 shift @arg;
242 warn "attach argument '$type' not supported, ignoring.\n";
243 }
244 }
245
246 \%undo
247}
248
249sub _attach_attachment {
250 my ($obj, $name, %arg) = @_;
251
252 my $res;
253
254 if (my $attach = $attachment{$name}) {
255 my $registry = $obj->registry;
256
257 for (@$attach) {
258 my ($klass, @attach) = @$_;
259 $res = _attach @$registry, $klass, @attach;
260 }
261
262 $obj->{$name} = \%arg;
263 } else {
264 warn "object uses attachment '$name' that is not available, postponing.\n";
265 }
266
267 $obj->{_attachment}{$name} = undef;
268
269 $res->{attachment} = $name;
270 $res
271}
272
273sub cf::object::attach {
274 my ($obj, $name, %arg) = @_;
275
276 _attach_attachment $obj, $name, %arg;
277}
278
279sub cf::player::attach {
280 my ($obj, $name, %arg) = @_;
281
282 _attach_attachment KLASS_PLAYER, $obj, $name, %arg;
283}
284
285sub cf::map::attach {
286 my ($obj, $name, %arg) = @_;
287
288 _attach_attachment KLASS_MAP, $obj, $name, %arg;
289}
290
291sub attach_global {
292 _attach @CB_GLOBAL, KLASS_GLOBAL, @_
293}
294
295sub attach_to_type {
296 my $type = shift;
297 my $subtype = shift;
298
299 _attach @{$CB_TYPE[$type + $subtype * NUM_SUBTYPES]}, KLASS_OBJECT, @_
300}
301
302sub attach_to_objects {
303 _attach @CB_OBJECT, KLASS_OBJECT, @_
304}
305
306sub attach_to_players {
307 _attach @CB_PLAYER, KLASS_PLAYER, @_
308}
309
310sub attach_to_maps {
311 _attach @CB_MAP, KLASS_MAP, @_
312}
313
314sub register_attachment {
315 my $name = shift;
316
317 $attachment{$name} = [[KLASS_OBJECT, @_]];
318}
319
320our $override;
321our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
322
323sub override {
324 $override = 1;
325 @invoke_results = ();
326}
327
328sub do_invoke {
329 my $event = shift;
330 my $callbacks = shift;
331
332 @invoke_results = ();
333
334 local $override;
335
336 for (@$callbacks) {
337 eval { &{$_->[1]} };
338
339 if ($@) {
340 warn "$@";
341 warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n";
342 override;
343 }
344
345 return 1 if $override;
346 }
347
348 0
349}
350
351#############################################################################
352# object support
353
354sub instantiate {
355 my ($obj, $data) = @_;
356
357 $data = from_json $data;
358
359 for (@$data) {
360 my ($name, $args) = @$_;
361
362 $obj->attach ($name, %{$args || {} });
363 }
364}
365
366# basically do the same as instantiate, without calling instantiate
367sub reattach {
368 my ($obj) = @_;
369 my $registry = $obj->registry;
370
371 @$registry = ();
372
373 delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} || {} };
374
375 for my $name (keys %{ $obj->{_attachment} || {} }) {
376 if (my $attach = $attachment{$name}) {
377 for (@$attach) {
378 my ($klass, @attach) = @$_;
379 _attach @$registry, $klass, @attach;
380 }
381 } else {
382 warn "object uses attachment '$name' that is not available, postponing.\n";
383 }
384 }
385}
386
387sub object_freezer_save {
388 my ($filename, $objs) = @_;
389
390 if (@$objs) {
391 open my $fh, ">:raw", "$filename.pst~";
392 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
393 close $fh;
394 chmod SAVE_MODE, "$filename.pst~";
395 rename "$filename.pst~", "$filename.pst";
396 } else {
397 unlink "$filename.pst";
398 }
399
400 chmod SAVE_MODE, "$filename~";
401 rename "$filename~", $filename;
402}
403
404sub object_thawer_load {
405 my ($filename) = @_;
406
407 open my $fh, "<:raw:perlio", "$filename.pst"
408 or return;
409
410 eval { local $/; (Storable::thaw <$fh>)->{objs} }
411}
412
413attach_to_objects
414 prio => -1000000,
415 on_clone => sub {
416 my ($src, $dst) = @_;
417
418 @{$dst->registry} = @{$src->registry};
419
420 %$dst = %$src;
421
422 %{$dst->{_attachment}} = %{$src->{_attachment}}
423 if exists $src->{_attachment};
424 },
425;
426
427#############################################################################
428# old plug-in events
429
95sub inject_event { 430sub inject_event {
96 my $extension = shift; 431 my $extension = shift;
97 my $event_code = shift; 432 my $event_code = shift;
98 433
99 my $cb = $hook[$event_code]{$extension} 434 my $cb = $hook[$event_code]{$extension}
141} 476}
142 477
143sub register { 478sub register {
144 my ($base, $pkg) = @_; 479 my ($base, $pkg) = @_;
145 480
146 for my $idx (0 .. $#EVENT) { 481 #TODO
147 if (my $ref = $pkg->can ("on_$EVENT[$idx]")) {
148 #warn "registering $EVENT[$idx] hook to '$pkg'\n";
149 $hook[$idx]{$base} = $ref;
150 }
151 }
152} 482}
153 483
154sub load_extension { 484sub load_extension {
155 my ($path) = @_; 485 my ($path) = @_;
156 486
157 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 487 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
158 my $base = $1; 488 my $base = $1;
159 my $pkg = $1; 489 my $pkg = $1;
160 $pkg =~ s/[^[:word:]]/_/g; 490 $pkg =~ s/[^[:word:]]/_/g;
161 $pkg = "cf::ext::$pkg"; 491 $pkg = "ext::$pkg";
162 492
163 warn "loading '$path' into '$pkg'\n"; 493 warn "loading '$path' into '$pkg'\n";
164 494
165 open my $fh, "<:utf8", $path 495 open my $fh, "<:utf8", $path
166 or die "$path: $!"; 496 or die "$path: $!";
187 my ($pkg) = @_; 517 my ($pkg) = @_;
188 518
189 warn "removing extension $pkg\n"; 519 warn "removing extension $pkg\n";
190 520
191 # remove hooks 521 # remove hooks
522 #TODO
192 for my $idx (0 .. $#EVENT) { 523# for my $idx (0 .. $#PLUGIN_EVENT) {
193 delete $hook[$idx]{$pkg}; 524# delete $hook[$idx]{$pkg};
194 } 525# }
195 526
196 # remove commands 527 # remove commands
197 for my $name (keys %command) { 528 for my $name (keys %command) {
198 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} }; 529 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };
199 530
209 # remove extcmds 540 # remove extcmds
210 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 541 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
211 delete $extcmd{$name}; 542 delete $extcmd{$name};
212 } 543 }
213 544
214 if (my $cb = $pkg->can ("on_unload")) { 545 if (my $cb = $pkg->can ("unload")) {
215 eval { 546 eval {
216 $cb->($pkg); 547 $cb->($pkg);
217 1 548 1
218 } or warn "$pkg unloaded, but with errors: $@"; 549 } or warn "$pkg unloaded, but with errors: $@";
219 } 550 }
231 1 562 1
232 } or warn "$ext not loaded: $@"; 563 } or warn "$ext not loaded: $@";
233 } 564 }
234} 565}
235 566
567sub _perl_reload(&) {
568 my ($msg) = @_;
569
570 $msg->("reloading...");
571
572 eval {
573 # 1. cancel all watchers
574 $_->cancel for Event::all_watchers;
575
576 # 2. unload all extensions
577 for (@exts) {
578 $msg->("unloading <$_>");
579 unload_extension $_;
580 }
581
582 # 3. unload all modules loaded from $LIBDIR
583 while (my ($k, $v) = each %INC) {
584 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
585
586 $msg->("removing <$k>");
587 delete $INC{$k};
588
589 $k =~ s/\.pm$//;
590 $k =~ s/\//::/g;
591
592 if (my $cb = $k->can ("unload_module")) {
593 $cb->();
594 }
595
596 Symbol::delete_package $k;
597 }
598
599 # 4. get rid of safe::, as good as possible
600 Symbol::delete_package "safe::$_"
601 for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
602
603 # 5. remove register_script_function callbacks
604 # TODO
605
606 # 6. unload cf.pm "a bit"
607 delete $INC{"cf.pm"};
608
609 # don't, removes xs symbols, too,
610 # and global variables created in xs
611 #Symbol::delete_package __PACKAGE__;
612
613 # 7. reload cf.pm
614 $msg->("reloading cf.pm");
615 require cf;
616 };
617 $msg->($@) if $@;
618
619 $msg->("reloaded");
620};
621
622sub perl_reload() {
623 _perl_reload {
624 warn $_[0];
625 print "$_[0]\n";
626 };
627}
628
236register_command "perl-reload", 0, sub { 629register_command "perl-reload", 0, sub {
237 my ($who, $arg) = @_; 630 my ($who, $arg) = @_;
238 631
239 if ($who->flag (FLAG_WIZ)) { 632 if ($who->flag (FLAG_WIZ)) {
240 $who->message ("reloading..."); 633 _perl_reload {
241 634 warn $_[0];
242 warn "reloading...\n"; 635 $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 }; 636 };
287 warn $@ if $@;
288 $who->message ($@) if $@;
289 warn "reloaded\n";
290
291 $who->message ("reloaded");
292 } else {
293 $who->message ("Intruder Alert!");
294 } 637 }
295}; 638};
296
297#############################################################################
298# utility functions
299
300use JSON::Syck (); # TODO# replace by JSON::PC once working
301
302sub from_json($) {
303 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
304 JSON::Syck::Load $_[0]
305}
306
307sub to_json($) {
308 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
309 JSON::Syck::Dump $_[0]
310}
311 639
312############################################################################# 640#############################################################################
313# extcmd framework, basically convert ext <msg> 641# extcmd framework, basically convert ext <msg>
314# into pkg::->on_extcmd_arg1 (...) while shortcutting a few 642# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
315 643
316sub on_extcmd { 644attach_to_players
645 on_extcmd => sub {
317 my ($pl, $buf) = @_; 646 my ($pl, $buf) = @_;
318 647
319 my $msg = eval { from_json $buf }; 648 my $msg = eval { from_json $buf };
320 649
321 if (ref $msg) { 650 if (ref $msg) {
322 if (my $cb = $extcmd{$msg->{msgtype}}) { 651 if (my $cb = $extcmd{$msg->{msgtype}}) {
323 if (my %reply = $cb->[0]->($pl, $msg)) { 652 if (my %reply = $cb->[0]->($pl, $msg)) {
324 $pl->ext_reply ($msg->{msgid}, %reply); 653 $pl->ext_reply ($msg->{msgid}, %reply);
654 }
655 }
656 } else {
657 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
658 }
659
660 cf::override;
661 },
662;
663
664#############################################################################
665# load/save/clean perl data associated with a map
666
667*cf::mapsupport::on_clean = sub {
668 my ($map) = @_;
669
670 my $path = $map->tmpname;
671 defined $path or return;
672
673 unlink "$path.pst";
674};
675
676# old style persistent data, TODO: remove #d#
677*cf::mapsupport::on_swapin =
678*cf::mapsupport::on_load = sub {
679 my ($map) = @_;
680
681 my $path = $map->tmpname;
682 $path = $map->path unless defined $path;
683
684 open my $fh, "<:raw", "$path.cfperl"
685 or return; # no perl data
686
687 my $data = Storable::thaw do { local $/; <$fh> };
688
689 $data->{version} <= 1
690 or return; # too new
691
692 $map->_set_obs ($data->{obs});
693 $map->invoke (EVENT_MAP_UPGRADE);
694};
695
696attach_to_maps prio => -10000, package => cf::mapsupport::;
697
698#############################################################################
699# load/save perl data associated with player->ob objects
700
701sub all_objects(@) {
702 @_, map all_objects ($_->inv), @_
703}
704
705attach_to_players
706 on_load => sub {
707 my ($pl, $path) = @_;
708
709 for my $o (all_objects $pl->ob) {
710 if (my $value = $o->get_ob_key_value ("_perl_data")) {
711 $o->set_ob_key_value ("_perl_data");
712
713 %$o = %{ Storable::thaw pack "H*", $value };
325 } 714 }
326 } 715 }
327 } else {
328 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
329 } 716 },
330 717;
331 1
332}
333
334#############################################################################
335# load/save/clean perl data associated with a map
336
337*on_mapclean = sub {
338 my ($map) = @_;
339
340 my $path = $map->tmpname;
341 defined $path or return;
342
343 unlink "$path.cfperl";
344};
345
346*on_mapin =
347*on_mapload = sub {
348 my ($map) = @_;
349
350 my $path = $map->tmpname;
351 $path = $map->path unless defined $path;
352
353 open my $fh, "<:raw", "$path.cfperl"
354 or return; # no perl data
355
356 my $data = Storable::thaw do { local $/; <$fh> };
357
358 $data->{version} <= 1
359 or return; # too new
360
361 $map->_set_obs ($data->{obs});
362};
363
364*on_mapout = sub {
365 my ($map) = @_;
366
367 my $path = $map->tmpname;
368 $path = $map->path unless defined $path;
369
370 my $obs = $map->_get_obs;
371
372 if (defined $obs) {
373 open my $fh, ">:raw", "$path.cfperl"
374 or die "$path.cfperl: $!";
375
376 stat $path;
377
378 print $fh Storable::nfreeze {
379 size => (stat _)[7],
380 time => (stat _)[9],
381 version => 1,
382 obs => $obs,
383 };
384
385 chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible *g*
386 } else {
387 unlink "$path.cfperl";
388 }
389};
390
391#############################################################################
392# load/save perl data associated with player->ob objects
393
394sub all_objects(@) {
395 @_, map all_objects ($_->inv), @_
396}
397
398*on_player_load = sub {
399 my ($ob, $path) = @_;
400
401 for my $o (all_objects $ob) {
402 if (my $value = $o->get_ob_key_value ("_perl_data")) {
403 $o->set_ob_key_value ("_perl_data");
404
405 %$o = %{ Storable::thaw pack "H*", $value };
406 }
407 }
408};
409
410*on_player_save = sub {
411 my ($ob, $path) = @_;
412
413 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
414 for grep %$_, all_objects $ob;
415};
416 718
417############################################################################# 719#############################################################################
418# core extensions - in perl 720# core extensions - in perl
419 721
420=item cf::player::exists $login 722=item cf::player::exists $login
466} 768}
467 769
468############################################################################# 770#############################################################################
469# map scripting support 771# map scripting support
470 772
471our $safe = new Safe "ext"; 773our $safe = new Safe "safe";
472our $safe_hole = new Safe::Hole; 774our $safe_hole = new Safe::Hole;
473 775
474$SIG{FPE} = 'IGNORE'; 776$SIG{FPE} = 'IGNORE';
475 777
476$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 778$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
482 ["cf::object::player" => qw(player)], 784 ["cf::object::player" => qw(player)],
483 ["cf::player" => qw(peaceful)], 785 ["cf::player" => qw(peaceful)],
484) { 786) {
485 no strict 'refs'; 787 no strict 'refs';
486 my ($pkg, @funs) = @$_; 788 my ($pkg, @funs) = @$_;
487 *{"ext::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 789 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
488 for @funs; 790 for @funs;
489} 791}
490 792
491sub safe_eval($;@) { 793sub safe_eval($;@) {
492 my ($code, %vars) = @_; 794 my ($code, %vars) = @_;
494 my $qcode = $code; 796 my $qcode = $code;
495 $qcode =~ s/"/‟/g; # not allowed in #line filenames 797 $qcode =~ s/"/‟/g; # not allowed in #line filenames
496 $qcode =~ s/\n/\\n/g; 798 $qcode =~ s/\n/\\n/g;
497 799
498 local $_; 800 local $_;
499 local @ext::cf::_safe_eval_args = values %vars; 801 local @safe::cf::_safe_eval_args = values %vars;
500 802
501 $code = 803 my $eval =
502 "do {\n" 804 "do {\n"
503 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 805 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
504 . "#line 0 \"{$qcode}\"\n" 806 . "#line 0 \"{$qcode}\"\n"
505 . $code 807 . $code
506 . "\n}" 808 . "\n}"
507 ; 809 ;
508 810
509 sub_generation_inc; 811 sub_generation_inc;
510 my @res = wantarray ? $safe->reval ($code) : scalar $safe->reval ($code); 812 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
511 sub_generation_inc; 813 sub_generation_inc;
814
815 if ($@) {
816 warn "$@";
817 warn "while executing safe code '$code'\n";
818 warn "with arguments " . (join " ", %vars) . "\n";
819 }
512 820
513 wantarray ? @res : $res[0] 821 wantarray ? @res : $res[0]
514} 822}
515 823
516sub register_script_function { 824sub register_script_function {
517 my ($fun, $cb) = @_; 825 my ($fun, $cb) = @_;
518 826
519 no strict 'refs'; 827 no strict 'refs';
520 *{"ext::$fun"} = $safe_hole->wrap ($cb); 828 *{"safe::$fun"} = $safe_hole->wrap ($cb);
521} 829}
522 830
523############################################################################# 831#############################################################################
524# the server's main() 832# the server's main()
525 833
526sub run { 834sub main {
527 Event::loop; 835 Event::loop;
528} 836}
529 837
530############################################################################# 838#############################################################################
531# initialisation 839# initialisation
543 cf::server_tick; # one server iteration 851 cf::server_tick; # one server iteration
544 852
545 my $NOW = Event::time; 853 my $NOW = Event::time;
546 $NEXT_TICK += $TICK; 854 $NEXT_TICK += $TICK;
547 855
548 # if we are delayed by > 0.25 second, skip ticks 856 # if we are delayed by four ticks, skip them all
549 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + .25; 857 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
550 858
551 $TICK_WATCHER->at ($NEXT_TICK); 859 $TICK_WATCHER->at ($NEXT_TICK);
552 $TICK_WATCHER->start; 860 $TICK_WATCHER->start;
553 }, 861 },
554); 862);
555 863
864_reload_2;
865
5561 8661
557 867

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines