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.31 by elmex, Mon Aug 14 04:22:04 2006 UTC vs.
Revision 1.50 by root, Mon Aug 28 07:07:42 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
16_reload_1;
17
15our %COMMAND; 18our %COMMAND = ();
16our @EVENT; 19our @EVENT;
17our %PROP_TYPE; 20our %PROP_TYPE;
18our %PROP_IDX; 21our %PROP_IDX;
19our $LIBDIR = maps_directory "perl"; 22our $LIBDIR = maps_directory "perl";
20 23
24our $TICK = MAX_TIME * 1e-6;
25our $TICK_WATCHER;
26our $NEXT_TICK;
27
21BEGIN { 28BEGIN {
22 @EVENT = map lc, @EVENT;
23
24 *CORE::GLOBAL::warn = sub { 29 *CORE::GLOBAL::warn = sub {
25 my $msg = join "", @_; 30 my $msg = join "", @_;
26 $msg .= "\n" 31 $msg .= "\n"
27 unless $msg =~ /\n$/; 32 unless $msg =~ /\n$/;
28 33
63prop_gen PLAYER_PROP => "cf::object::player"; 68prop_gen PLAYER_PROP => "cf::object::player";
64 69
65prop_gen MAP_PROP => "cf::map"; 70prop_gen MAP_PROP => "cf::map";
66prop_gen ARCH_PROP => "cf::arch"; 71prop_gen ARCH_PROP => "cf::arch";
67 72
68# guessed hierarchies
69
70@ext::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 73@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
71@ext::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object';
72 74
73# 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
74# within the Safe compartment. 76# within the Safe compartment.
75for 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)) {
76 no strict 'refs'; 78 no strict 'refs';
77 @{"ext::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 79 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
78} 80}
79 81
80$Event::DIED = sub { 82$Event::DIED = sub {
81 warn "error in event callback: @_"; 83 warn "error in event callback: @_";
82}; 84};
85my @exts; 87my @exts;
86my @hook; 88my @hook;
87my %command; 89my %command;
88my %extcmd; 90my %extcmd;
89 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 $filename .= ".pst";
391
392 if (@$objs) {
393 open my $fh, ">:raw", "$filename~";
394 chmod $fh, SAVE_MODE;
395 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
396 close $fh;
397 rename "$filename~", $filename;
398 } else {
399 unlink $filename;
400 }
401}
402
403sub object_thawer_load {
404 my ($filename) = @_;
405
406 open my $fh, "<:raw:perlio", "$filename.pst"
407 or return;
408
409 eval { local $/; (Storable::thaw <$fh>)->{objs} }
410}
411
412attach_to_objects
413 prio => -1000000,
414 on_clone => sub {
415 my ($src, $dst) = @_;
416
417 @{$dst->registry} = @{$src->registry};
418
419 %$dst = %$src;
420
421 %{$dst->{_attachment}} = %{$src->{_attachment}}
422 if exists $src->{_attachment};
423 },
424;
425
426#############################################################################
427# old plug-in events
428
90sub inject_event { 429sub inject_event {
91 my $extension = shift; 430 my $extension = shift;
92 my $event_code = shift; 431 my $event_code = shift;
93 432
94 my $cb = $hook[$event_code]{$extension} 433 my $cb = $hook[$event_code]{$extension}
136} 475}
137 476
138sub register { 477sub register {
139 my ($base, $pkg) = @_; 478 my ($base, $pkg) = @_;
140 479
141 for my $idx (0 .. $#EVENT) { 480 #TODO
142 if (my $ref = $pkg->can ("on_$EVENT[$idx]")) {
143 #warn "registering $EVENT[$idx] hook to '$pkg'\n";
144 $hook[$idx]{$base} = $ref;
145 }
146 }
147} 481}
148 482
149sub load_extension { 483sub load_extension {
150 my ($path) = @_; 484 my ($path) = @_;
151 485
152 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 486 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
153 my $base = $1; 487 my $base = $1;
154 my $pkg = $1; 488 my $pkg = $1;
155 $pkg =~ s/[^[:word:]]/_/g; 489 $pkg =~ s/[^[:word:]]/_/g;
156 $pkg = "cf::ext::$pkg"; 490 $pkg = "ext::$pkg";
157 491
158 warn "loading '$path' into '$pkg'\n"; 492 warn "loading '$path' into '$pkg'\n";
159 493
160 open my $fh, "<:utf8", $path 494 open my $fh, "<:utf8", $path
161 or die "$path: $!"; 495 or die "$path: $!";
182 my ($pkg) = @_; 516 my ($pkg) = @_;
183 517
184 warn "removing extension $pkg\n"; 518 warn "removing extension $pkg\n";
185 519
186 # remove hooks 520 # remove hooks
521 #TODO
187 for my $idx (0 .. $#EVENT) { 522# for my $idx (0 .. $#PLUGIN_EVENT) {
188 delete $hook[$idx]{$pkg}; 523# delete $hook[$idx]{$pkg};
189 } 524# }
190 525
191 # remove commands 526 # remove commands
192 for my $name (keys %command) { 527 for my $name (keys %command) {
193 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} }; 528 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };
194 529
204 # remove extcmds 539 # remove extcmds
205 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 540 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
206 delete $extcmd{$name}; 541 delete $extcmd{$name};
207 } 542 }
208 543
209 if (my $cb = $pkg->can ("on_unload")) { 544 if (my $cb = $pkg->can ("unload")) {
210 eval { 545 eval {
211 $cb->($pkg); 546 $cb->($pkg);
212 1 547 1
213 } or warn "$pkg unloaded, but with errors: $@"; 548 } or warn "$pkg unloaded, but with errors: $@";
214 } 549 }
226 1 561 1
227 } or warn "$ext not loaded: $@"; 562 } or warn "$ext not loaded: $@";
228 } 563 }
229} 564}
230 565
566sub _perl_reload(&) {
567 my ($msg) = @_;
568
569 $msg->("reloading...");
570
571 eval {
572 # 1. cancel all watchers
573 $_->cancel for Event::all_watchers;
574
575 # 2. unload all extensions
576 for (@exts) {
577 $msg->("unloading <$_>");
578 unload_extension $_;
579 }
580
581 # 3. unload all modules loaded from $LIBDIR
582 while (my ($k, $v) = each %INC) {
583 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
584
585 $msg->("removing <$k>");
586 delete $INC{$k};
587
588 $k =~ s/\.pm$//;
589 $k =~ s/\//::/g;
590
591 if (my $cb = $k->can ("unload_module")) {
592 $cb->();
593 }
594
595 Symbol::delete_package $k;
596 }
597
598 # 4. get rid of safe::, as good as possible
599 Symbol::delete_package "safe::$_"
600 for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
601
602 # 5. remove register_script_function callbacks
603 # TODO
604
605 # 6. unload cf.pm "a bit"
606 delete $INC{"cf.pm"};
607
608 # don't, removes xs symbols, too,
609 # and global variables created in xs
610 #Symbol::delete_package __PACKAGE__;
611
612 # 7. reload cf.pm
613 $msg->("reloading cf.pm");
614 require cf;
615 };
616 $msg->($@) if $@;
617
618 $msg->("reloaded");
619};
620
621sub perl_reload() {
622 _perl_reload {
623 warn $_[0];
624 print "$_[0]\n";
625 };
626}
627
231register_command "perl-reload", 0, sub { 628register_command "perl-reload", 0, sub {
232 my ($who, $arg) = @_; 629 my ($who, $arg) = @_;
233 630
234 if ($who->flag (FLAG_WIZ)) { 631 if ($who->flag (FLAG_WIZ)) {
235 $who->message ("reloading..."); 632 _perl_reload {
236 633 warn $_[0];
237 warn "reloading...\n"; 634 $who->message ($_[0]);
238 eval {
239 # 1. cancel all watchers
240 $_->cancel for Event::all_watchers;
241
242 # 2. unload all extensions
243 for (@exts) {
244 $who->message ("unloading <$_>");
245 unload_extension $_;
246 }
247
248 # 3. unload all modules loaded from $LIBDIR
249 while (my ($k, $v) = each %INC) {
250 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
251
252 $who->message ("removing <$k>");
253 delete $INC{$k};
254
255 $k =~ s/\.pm$//;
256 $k =~ s/\//::/g;
257
258 if (my $cb = $k->can ("unload_module")) {
259 $cb->();
260 }
261
262 Symbol::delete_package $k;
263 }
264
265 # 4. get rid of ext::, as good as possible
266 Symbol::delete_package "ext::$_"
267 for qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region);
268
269 # 5. remove register_script_function callbacks
270 # TODO
271
272 # 6. unload cf.pm "a bit"
273 delete $INC{"cf.pm"};
274
275 # don't, removes xs symbols, too
276 #Symbol::delete_package __PACKAGE__;
277
278 # 7. reload cf.pm
279 $who->message ("reloading cf.pm");
280 require cf;
281 }; 635 };
282 warn $@ if $@;
283 $who->message ($@) if $@;
284 warn "reloaded\n";
285
286 $who->message ("reloaded");
287 } else {
288 $who->message ("Intruder Alert!");
289 } 636 }
290}; 637};
291
292#############################################################################
293# utility functions
294
295use JSON::Syck (); # TODO# replace by JSON::PC once working
296
297sub from_json($) {
298 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
299 JSON::Syck::Load $_[0]
300}
301
302sub to_json($) {
303 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
304 JSON::Syck::Dump $_[0]
305}
306 638
307############################################################################# 639#############################################################################
308# extcmd framework, basically convert ext <msg> 640# extcmd framework, basically convert ext <msg>
309# into pkg::->on_extcmd_arg1 (...) while shortcutting a few 641# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
310 642
311sub on_extcmd { 643attach_to_players
644 on_extcmd => sub {
312 my ($pl, $buf) = @_; 645 my ($pl, $buf) = @_;
313 646
314 my $msg = eval { from_json $buf }; 647 my $msg = eval { from_json $buf };
315 648
316 if (ref $msg) { 649 if (ref $msg) {
317 if (my $cb = $extcmd{$msg->{msgtype}}) { 650 if (my $cb = $extcmd{$msg->{msgtype}}) {
318 if (my %reply = $cb->[0]->($pl, $msg)) { 651 if (my %reply = $cb->[0]->($pl, $msg)) {
319 $pl->ext_reply ($msg->{msgid}, %reply); 652 $pl->ext_reply ($msg->{msgid}, %reply);
653 }
654 }
655 } else {
656 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
657 }
658
659 cf::override;
660 },
661;
662
663#############################################################################
664# load/save/clean perl data associated with a map
665
666*cf::mapsupport::on_clean = sub {
667 my ($map) = @_;
668
669 my $path = $map->tmpname;
670 defined $path or return;
671
672 unlink "$path.cfperl";
673 unlink "$path.pst";
674};
675
676*cf::mapsupport::on_swapin =
677*cf::mapsupport::on_load = sub {
678 my ($map) = @_;
679
680 my $path = $map->tmpname;
681 $path = $map->path unless defined $path;
682
683 open my $fh, "<:raw", "$path.cfperl"
684 or return; # no perl data
685
686 my $data = Storable::thaw do { local $/; <$fh> };
687
688 $data->{version} <= 1
689 or return; # too new
690
691 $map->_set_obs ($data->{obs});
692 $map->invoke (EVENT_MAP_UPGRADE);
693};
694
695attach_to_maps prio => -10000, package => cf::mapsupport::;
696
697#############################################################################
698# load/save perl data associated with player->ob objects
699
700sub all_objects(@) {
701 @_, map all_objects ($_->inv), @_
702}
703
704attach_to_players
705 on_load => sub {
706 my ($pl, $path) = @_;
707
708 for my $o (all_objects $pl->ob) {
709 if (my $value = $o->get_ob_key_value ("_perl_data")) {
710 $o->set_ob_key_value ("_perl_data");
711
712 %$o = %{ Storable::thaw pack "H*", $value };
320 } 713 }
321 } 714 }
322 } else {
323 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
324 } 715 },
325 716;
326 1
327}
328
329#############################################################################
330# load/save/clean perl data associated with a map
331
332*on_mapclean = sub {
333 my ($map) = @_;
334
335 my $path = $map->tmpname;
336 defined $path or return;
337
338 unlink "$path.cfperl";
339};
340
341*on_mapin =
342*on_mapload = sub {
343 my ($map) = @_;
344
345 my $path = $map->tmpname;
346 $path = $map->path unless defined $path;
347
348 open my $fh, "<:raw", "$path.cfperl"
349 or return; # no perl data
350
351 my $data = Storable::thaw do { local $/; <$fh> };
352
353 $data->{version} <= 1
354 or return; # too new
355
356 $map->_set_obs ($data->{obs});
357};
358
359*on_mapout = sub {
360 my ($map) = @_;
361
362 my $path = $map->tmpname;
363 $path = $map->path unless defined $path;
364
365 my $obs = $map->_get_obs;
366
367 if (defined $obs) {
368 open my $fh, ">:raw", "$path.cfperl"
369 or die "$path.cfperl: $!";
370
371 stat $path;
372
373 print $fh Storable::nfreeze {
374 size => (stat _)[7],
375 time => (stat _)[9],
376 version => 1,
377 obs => $obs,
378 };
379
380 chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible *g*
381 } else {
382 unlink "$path.cfperl";
383 }
384};
385
386#############################################################################
387# load/save perl data associated with player->ob objects
388
389*on_player_load = sub {
390 my ($ob, $path) = @_;
391
392 for my $o ($ob, $ob->inv) {
393 if (my $value = $o->get_ob_key_value ("_perl_data")) {
394 $o->set_ob_key_value ("_perl_data");
395
396 %$o = %{ Storable::thaw pack "H*", $value };
397 }
398 }
399};
400
401*on_player_save = sub {
402 my ($ob, $path) = @_;
403
404 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
405 for grep %$_, $ob, $ob->inv;
406};
407 717
408############################################################################# 718#############################################################################
409# core extensions - in perl 719# core extensions - in perl
410 720
411=item cf::player::exists $login 721=item cf::player::exists $login
457} 767}
458 768
459############################################################################# 769#############################################################################
460# map scripting support 770# map scripting support
461 771
462our $safe = new Safe "ext"; 772our $safe = new Safe "safe";
463our $safe_hole = new Safe::Hole; 773our $safe_hole = new Safe::Hole;
464 774
465$SIG{FPE} = 'IGNORE'; 775$SIG{FPE} = 'IGNORE';
466 776
467$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 777$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
473 ["cf::object::player" => qw(player)], 783 ["cf::object::player" => qw(player)],
474 ["cf::player" => qw(peaceful)], 784 ["cf::player" => qw(peaceful)],
475) { 785) {
476 no strict 'refs'; 786 no strict 'refs';
477 my ($pkg, @funs) = @$_; 787 my ($pkg, @funs) = @$_;
478 *{"ext::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 788 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
479 for @funs; 789 for @funs;
480} 790}
481 791
482sub safe_eval($;@) { 792sub safe_eval($;@) {
483 my ($code, %vars) = @_; 793 my ($code, %vars) = @_;
485 my $qcode = $code; 795 my $qcode = $code;
486 $qcode =~ s/"/‟/g; # not allowed in #line filenames 796 $qcode =~ s/"/‟/g; # not allowed in #line filenames
487 $qcode =~ s/\n/\\n/g; 797 $qcode =~ s/\n/\\n/g;
488 798
489 local $_; 799 local $_;
490 local @ext::cf::_safe_eval_args = values %vars; 800 local @safe::cf::_safe_eval_args = values %vars;
491 801
492 $code = 802 my $eval =
493 "do {\n" 803 "do {\n"
494 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 804 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
495 . "#line 0 \"{$qcode}\"\n" 805 . "#line 0 \"{$qcode}\"\n"
496 . $code 806 . $code
497 . "\n}" 807 . "\n}"
498 ; 808 ;
499 809
500 sub_generation_inc; 810 sub_generation_inc;
501 my @res = wantarray ? $safe->reval ($code) : scalar $safe->reval ($code); 811 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
502 sub_generation_inc; 812 sub_generation_inc;
813
814 if ($@) {
815 warn "$@";
816 warn "while executing safe code '$code'\n";
817 warn "with arguments " . (join " ", %vars) . "\n";
818 }
503 819
504 wantarray ? @res : $res[0] 820 wantarray ? @res : $res[0]
505} 821}
506 822
507sub register_script_function { 823sub register_script_function {
508 my ($fun, $cb) = @_; 824 my ($fun, $cb) = @_;
509 825
510 no strict 'refs'; 826 no strict 'refs';
511 *{"ext::$fun"} = $safe_hole->wrap ($cb); 827 *{"safe::$fun"} = $safe_hole->wrap ($cb);
828}
829
830#############################################################################
831# the server's main()
832
833sub main {
834 Event::loop;
512} 835}
513 836
514############################################################################# 837#############################################################################
515# initialisation 838# initialisation
516 839
518 841
519unshift @INC, $LIBDIR; 842unshift @INC, $LIBDIR;
520 843
521load_extensions; 844load_extensions;
522 845
846$TICK_WATCHER = Event->timer (
847 prio => 1,
848 at => $NEXT_TICK || 1,
849 cb => sub {
850 cf::server_tick; # one server iteration
851
852 my $NOW = Event::time;
853 $NEXT_TICK += $TICK;
854
855 # if we are delayed by four ticks, skip them all
856 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
857
858 $TICK_WATCHER->at ($NEXT_TICK);
859 $TICK_WATCHER->start;
860 },
861);
862
863_reload_2;
864
5231 8651
524 866

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines