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.15 by root, Sun Jun 11 15:02:16 2006 UTC vs.
Revision 1.48 by root, Sun Aug 27 15:24:22 2006 UTC

1package cf; 1package cf;
2 2
3use Symbol; 3use Symbol;
4use List::Util; 4use List::Util;
5use Storable; 5use Storable;
6use Opcode;
7use Safe;
8use Safe::Hole;
9
10use Time::HiRes;
11use Event;
12$Event::Eval = 1; # no idea why this is required, but it is
6 13
7use strict; 14use strict;
8 15
16_reload_1;
17
9our %COMMAND; 18our %COMMAND = ();
10our @EVENT; 19our @EVENT;
11our %PROP_TYPE; 20our %PROP_TYPE;
12our %PROP_IDX; 21our %PROP_IDX;
22our $LIBDIR = maps_directory "perl";
23
24our $TICK = MAX_TIME * 1e-6;
25our $TICK_WATCHER;
26our $NEXT_TICK;
13 27
14BEGIN { 28BEGIN {
15 @EVENT = map lc, @EVENT;
16
17 *CORE::GLOBAL::warn = sub { 29 *CORE::GLOBAL::warn = sub {
18 my $msg = join "", @_; 30 my $msg = join "", @_;
19 $msg .= "\n" 31 $msg .= "\n"
20 unless $msg =~ /\n$/; 32 unless $msg =~ /\n$/;
21 33
… …
56prop_gen PLAYER_PROP => "cf::object::player"; 68prop_gen PLAYER_PROP => "cf::object::player";
57 69
58prop_gen MAP_PROP => "cf::map"; 70prop_gen MAP_PROP => "cf::map";
59prop_gen ARCH_PROP => "cf::arch"; 71prop_gen ARCH_PROP => "cf::arch";
60 72
61# guessed hierarchies 73@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
62 74
63@cf::object::player::ISA = 'cf::object'; 75# we bless all objects into (empty) derived classes to force a method lookup
64@cf::object::map::ISA = 'cf::object'; 76# within the Safe compartment.
77for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch)) {
78 no strict 'refs';
79 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
80}
81
82$Event::DIED = sub {
83 warn "error in event callback: @_";
84};
65 85
66my %ext_pkg; 86my %ext_pkg;
67my @exts; 87my @exts;
68my @hook; 88my @hook;
69my %command; 89my %command;
70my %extcmd; 90my %extcmd;
71 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 push @{$obj->{_attachment}}, $name;
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 attach $obj, $name, %{$args || {} };
362 }
363}
364
365# basically do the same as instantiate, without calling instantiate
366sub reattach {
367 my ($obj) = @_;
368 my $registry = $obj->registry;
369
370 @$registry = ();
371
372 for my $name (@{ $obj->{_attachment} }) {
373 if (my $attach = $attachment{$name}) {
374 for (@$attach) {
375 my ($klass, @attach) = @$_;
376 _attach @$registry, $klass, @attach;
377 }
378 } else {
379 warn "object uses attachment '$name' that is not available, postponing.\n";
380 }
381 }
382}
383
384sub object_freezer_save {
385 my ($filename, $objs) = @_;
386
387 $filename .= ".pst";
388
389 if (@$objs) {
390 open my $fh, ">:raw", "$filename~";
391 chmod $fh, SAVE_MODE;
392 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
393 close $fh;
394 rename "$filename~", $filename;
395 } else {
396 unlink $filename;
397 }
398}
399
400sub object_thawer_load {
401 my ($filename) = @_;
402
403 open my $fh, "<:raw:perlio", "$filename.pst"
404 or return;
405
406 eval { local $/; (Storable::thaw <$fh>)->{objs} }
407}
408
409attach_to_objects
410 prio => -1000000,
411 on_clone => sub {
412 my ($src, $dst) = @_;
413
414 @{$dst->registry} = @{$src->registry};
415
416 %$dst = %$src;
417
418 $dst->{_attachment} = [@{ $src->{_attachment} }]
419 if exists $src->{_attachment};
420 },
421;
422
423#############################################################################
424# old plug-in events
425
72sub inject_event { 426sub inject_event {
73 my $extension = shift; 427 my $extension = shift;
74 my $event_code = shift; 428 my $event_code = shift;
75 429
76 my $cb = $hook[$event_code]{$extension} 430 my $cb = $hook[$event_code]{$extension}
… …
100 454
101sub register_command { 455sub register_command {
102 my ($name, $time, $cb) = @_; 456 my ($name, $time, $cb) = @_;
103 457
104 my $caller = caller; 458 my $caller = caller;
105
106 warn "registering command '$name/$time' to '$caller'"; 459 #warn "registering command '$name/$time' to '$caller'";
107 460
108 push @{ $command{$name} }, [$time, $cb, $caller]; 461 push @{ $command{$name} }, [$time, $cb, $caller];
109 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @{ $command{$name} }; 462 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @{ $command{$name} };
110} 463}
111 464
465sub register_extcmd {
466 my ($name, $cb) = @_;
467
468 my $caller = caller;
469 #warn "registering extcmd '$name' to '$caller'";
470
471 $extcmd{$name} = [$cb, $caller];
472}
473
112sub register { 474sub register {
113 my ($base, $pkg) = @_; 475 my ($base, $pkg) = @_;
114 476
115 for my $idx (0 .. $#EVENT) { 477 #TODO
116 if (my $ref = $pkg->can ("on_$EVENT[$idx]")) {
117 warn "registering $EVENT[$idx] hook to '$pkg'\n";
118 $hook[$idx]{$base} = $ref;
119 }
120 }
121} 478}
122 479
123sub load_extension { 480sub load_extension {
124 my ($path) = @_; 481 my ($path) = @_;
125 482
126 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 483 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
127 my $base = $1; 484 my $base = $1;
128 my $pkg = $1; 485 my $pkg = $1;
129 $pkg =~ s/[^[:word:]]/_/g; 486 $pkg =~ s/[^[:word:]]/_/g;
130 $pkg = "cf::ext::$pkg"; 487 $pkg = "ext::$pkg";
131 488
132 warn "loading '$path' into '$pkg'\n"; 489 warn "loading '$path' into '$pkg'\n";
133 490
134 open my $fh, "<:utf8", $path 491 open my $fh, "<:utf8", $path
135 or die "$path: $!"; 492 or die "$path: $!";
… …
145 502
146 push @exts, $pkg; 503 push @exts, $pkg;
147 $ext_pkg{$base} = $pkg; 504 $ext_pkg{$base} = $pkg;
148 505
149# no strict 'refs'; 506# no strict 'refs';
150# @{"$pkg\::ISA"} = cf::ext::; 507# @{"$pkg\::ISA"} = ext::;
151 508
152 register $base, $pkg; 509 register $base, $pkg;
153} 510}
154 511
155sub unload_extension { 512sub unload_extension {
156 my ($pkg) = @_; 513 my ($pkg) = @_;
157 514
158 warn "removing extension $pkg\n"; 515 warn "removing extension $pkg\n";
159 516
160 # remove hooks 517 # remove hooks
518 #TODO
161 for my $idx (0 .. $#EVENT) { 519# for my $idx (0 .. $#PLUGIN_EVENT) {
162 delete $hook[$idx]{$pkg}; 520# delete $hook[$idx]{$pkg};
163 } 521# }
164 522
165 # remove commands 523 # remove commands
166 for my $name (keys %command) { 524 for my $name (keys %command) {
167 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} }; 525 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };
168 526
… …
174 delete $COMMAND{"$name\000"}; 532 delete $COMMAND{"$name\000"};
175 } 533 }
176 } 534 }
177 535
178 # remove extcmds 536 # remove extcmds
179 for my $name (keys %command) { 537 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
180 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };
181
182 if (@cb) {
183 $command{$name} = \@cb;
184 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @cb;
185 } else {
186 delete $command{$name}; 538 delete $extcmd{$name};
187 delete $COMMAND{"$name\000"};
188 }
189 } 539 }
190 540
541 if (my $cb = $pkg->can ("unload")) {
542 eval {
543 $cb->($pkg);
544 1
545 } or warn "$pkg unloaded, but with errors: $@";
546 }
191 547
192 Symbol::delete_package $pkg; 548 Symbol::delete_package $pkg;
193} 549}
194 550
195sub load_extensions { 551sub load_extensions {
… …
202 1 558 1
203 } or warn "$ext not loaded: $@"; 559 } or warn "$ext not loaded: $@";
204 } 560 }
205} 561}
206 562
563sub _perl_reload(&) {
564 my ($msg) = @_;
565
566 $msg->("reloading...");
567
568 eval {
569 # 1. cancel all watchers
570 $_->cancel for Event::all_watchers;
571
572 # 2. unload all extensions
573 for (@exts) {
574 $msg->("unloading <$_>");
575 unload_extension $_;
576 }
577
578 # 3. unload all modules loaded from $LIBDIR
579 while (my ($k, $v) = each %INC) {
580 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
581
582 $msg->("removing <$k>");
583 delete $INC{$k};
584
585 $k =~ s/\.pm$//;
586 $k =~ s/\//::/g;
587
588 if (my $cb = $k->can ("unload_module")) {
589 $cb->();
590 }
591
592 Symbol::delete_package $k;
593 }
594
595 # 4. get rid of safe::, as good as possible
596 Symbol::delete_package "safe::$_"
597 for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
598
599 # 5. remove register_script_function callbacks
600 # TODO
601
602 # 6. unload cf.pm "a bit"
603 delete $INC{"cf.pm"};
604
605 # don't, removes xs symbols, too,
606 # and global variables created in xs
607 #Symbol::delete_package __PACKAGE__;
608
609 # 7. reload cf.pm
610 $msg->("reloading cf.pm");
611 require cf;
612 };
613 $msg->($@) if $@;
614
615 $msg->("reloaded");
616};
617
618sub perl_reload() {
619 _perl_reload {
620 warn $_[0];
621 print "$_[0]\n";
622 };
623}
624
207register_command "perl-reload", 0, sub { 625register_command "perl-reload", 0, sub {
208 my ($who, $arg) = @_; 626 my ($who, $arg) = @_;
209 627
210 if ($who->flag (FLAG_WIZ)) { 628 if ($who->flag (FLAG_WIZ)) {
211 $who->message ("reloading..."); 629 _perl_reload {
212 630 warn $_[0];
213 warn "reloading...\n"; 631 $who->message ($_[0]);
214 eval {
215 unload_extension $_ for @exts;
216 delete $INC{"cf.pm"};
217
218 # don't, removes xs symbols, too
219 #Symbol::delete_package $pkg;
220
221 require cf;
222 }; 632 };
223 warn $@ if $@;
224 $who->message ($@) if $@;
225 warn "reloaded\n";
226
227 $who->message ("reloaded");
228 } else {
229 $who->message ("Intruder Alert!");
230 } 633 }
231}; 634};
232 635
233############################################################################# 636#############################################################################
234# extcmd framework, basically convert ext <id> <pkg> arg1 args 637# extcmd framework, basically convert ext <msg>
235# into pkg::->on_extcmd_arg1 (...) while shortcutting a few 638# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
236 639
237sub on_extcmd { 640attach_to_players
641 on_extcmd => sub {
238 my ($pl, $buf) = @_; 642 my ($pl, $buf) = @_;
239 643
240 my ($id, $pkg, $name, $data) = split / /, $buf, 4; 644 my $msg = eval { from_json $buf };
241 645
242 if (my $method = "cf::ext::$pkg"->can ("on_extcmd_$name")) { 646 if (ref $msg) {
243 $method->($pl, $id, $buf); 647 if (my $cb = $extcmd{$msg->{msgtype}}) {
648 if (my %reply = $cb->[0]->($pl, $msg)) {
649 $pl->ext_reply ($msg->{msgid}, %reply);
650 }
651 }
652 } else {
653 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
654 }
655
656 cf::override;
244 } 657 },
245} 658;
246 659
247############################################################################# 660#############################################################################
248# load/save/clean perl data associated with a map 661# load/save/clean perl data associated with a map
249 662
250*on_mapclean = sub { 663*cf::mapsupport::on_clean = sub {
251 my ($map) = @_; 664 my ($map) = @_;
252 665
253 my $path = $map->tmpname; 666 my $path = $map->tmpname;
254 defined $path or return; 667 defined $path or return;
255 668
256 unlink "$path.cfperl"; 669 unlink "$path.cfperl";
670 unlink "$path.pst";
257}; 671};
258 672
259*on_mapin = 673*cf::mapsupport::on_swapin =
260*on_mapload = sub { 674*cf::mapsupport::on_load = sub {
261 my ($map) = @_; 675 my ($map) = @_;
262 676
263 my $path = $map->tmpname; 677 my $path = $map->tmpname;
264 $path = $map->path unless defined $path; 678 $path = $map->path unless defined $path;
265 679
… …
272 or return; # too new 686 or return; # too new
273 687
274 $map->_set_obs ($data->{obs}); 688 $map->_set_obs ($data->{obs});
275}; 689};
276 690
277*on_mapout = sub { 691attach_to_maps prio => -10000, package => cf::mapsupport::;
278 my ($map) = @_;
279 692
280 my $path = $map->tmpname; 693#############################################################################
281 $path = $map->path unless defined $path; 694# load/save perl data associated with player->ob objects
282 695
283 my $obs = $map->_get_obs; 696sub all_objects(@) {
697 @_, map all_objects ($_->inv), @_
698}
284 699
285 if (defined $obs) { 700attach_to_players
286 open my $fh, ">:raw", "$path.cfperl" 701 on_load => sub {
287 or die "$path.cfperl: $!"; 702 my ($pl, $path) = @_;
288 703
289 stat $path; 704 for my $o (all_objects $pl->ob) {
705 if (my $value = $o->get_ob_key_value ("_perl_data")) {
706 $o->set_ob_key_value ("_perl_data");
290 707
291 print $fh Storable::nfreeze { 708 %$o = %{ Storable::thaw pack "H*", $value };
292 size => (stat _)[7], 709 }
293 time => (stat _)[9],
294 version => 1,
295 obs => $obs,
296 }; 710 }
711 },
712;
297 713
298 chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible *g* 714#############################################################################
715# core extensions - in perl
716
717=item cf::player::exists $login
718
719Returns true when the given account exists.
720
721=cut
722
723sub cf::player::exists($) {
724 cf::player::find $_[0]
725 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;
726}
727
728=item $player->reply ($npc, $msg[, $flags])
729
730Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
731can be C<undef>. Does the right thing when the player is currently in a
732dialogue with the given NPC character.
733
734=cut
735
736# rough implementation of a future "reply" method that works
737# with dialog boxes.
738sub cf::object::player::reply($$$;$) {
739 my ($self, $npc, $msg, $flags) = @_;
740
741 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
742
743 if ($self->{record_replies}) {
744 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
299 } else { 745 } else {
300 unlink "$path.cfperl"; 746 $msg = $npc->name . " says: $msg" if $npc;
747 $self->message ($msg, $flags);
301 } 748 }
302}; 749}
303 750
304############################################################################# 751=item $player->ext_reply ($msgid, $msgtype, %msg)
305# load/save perl data associated with player->ob objects
306 752
307*on_player_load = sub { 753Sends an ext reply to the player.
754
755=cut
756
757sub cf::player::ext_reply($$$%) {
758 my ($self, $id, %msg) = @_;
759
760 $msg{msgid} = $id;
761
762 $self->send ("ext " . to_json \%msg);
763}
764
765#############################################################################
766# map scripting support
767
768our $safe = new Safe "safe";
769our $safe_hole = new Safe::Hole;
770
771$SIG{FPE} = 'IGNORE';
772
773$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
774
775# here we export the classes and methods available to script code
776
777for (
778 ["cf::object" => qw(contr pay_amount pay_player)],
779 ["cf::object::player" => qw(player)],
780 ["cf::player" => qw(peaceful)],
781) {
782 no strict 'refs';
783 my ($pkg, @funs) = @$_;
784 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
785 for @funs;
786}
787
788sub safe_eval($;@) {
308 my ($ob, $path) = @_; 789 my ($code, %vars) = @_;
309 790
310 if (open my $fh, "<:raw", "$path.cfperl") { 791 my $qcode = $code;
792 $qcode =~ s/"/‟/g; # not allowed in #line filenames
793 $qcode =~ s/\n/\\n/g;
311 794
312 #d##TODO#remove 795 local $_;
796 local @safe::cf::_safe_eval_args = values %vars;
313 797
314 my $data = Storable::thaw do { local $/; <$fh> }; 798 my $eval =
315 799 "do {\n"
316 $data->{version} <= 1 800 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
317 or return; # too new 801 . "#line 0 \"{$qcode}\"\n"
318 802 . $code
319 %$ob = %{$data->{ob}}; 803 . "\n}"
320 return;
321 } 804 ;
322 805
323 for my $o ($ob, $ob->inv) { 806 sub_generation_inc;
324 if (my $value = $o->get_ob_key_value ("_perl_data")) { 807 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
325 $o->set_ob_key_value ("_perl_data"); 808 sub_generation_inc;
326 809
327 %$o = %{ Storable::thaw pack "H*", $value }; 810 if ($@) {
328 } 811 warn "$@";
812 warn "while executing safe code '$code'\n";
813 warn "with arguments " . (join " ", %vars) . "\n";
329 } 814 }
330};
331 815
332*on_player_save = sub { 816 wantarray ? @res : $res[0]
333 my ($ob, $path) = @_; 817}
334 818
335 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_) 819sub register_script_function {
336 for grep %$_, $ob, $ob->inv; 820 my ($fun, $cb) = @_;
337 821
338 unlink "$path.cfperl";#d##TODO#remove 822 no strict 'refs';
339}; 823 *{"safe::$fun"} = $safe_hole->wrap ($cb);
824}
825
826#############################################################################
827# the server's main()
828
829sub main {
830 Event::loop;
831}
832
833#############################################################################
834# initialisation
340 835
341register "<global>", __PACKAGE__; 836register "<global>", __PACKAGE__;
342 837
838unshift @INC, $LIBDIR;
839
343load_extensions; 840load_extensions;
344 841
842$TICK_WATCHER = Event->timer (
843 prio => 1,
844 at => $NEXT_TICK || 1,
845 cb => sub {
846 cf::server_tick; # one server iteration
847
848 my $NOW = Event::time;
849 $NEXT_TICK += $TICK;
850
851 # if we are delayed by four ticks, skip them all
852 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
853
854 $TICK_WATCHER->at ($NEXT_TICK);
855 $TICK_WATCHER->start;
856 },
857);
858
859_reload_2;
860
3451 8611
346 862

Diff Legend

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