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.47 by root, Sun Aug 27 13:02:04 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)) { 77for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch)) {
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, ...)
111
112Attach a pre-registered attachment to an object.
113
114=item $player->attach ($attachment, ...)
115
116Attach a pre-registered attachment to a player.
117
118=item $map->attach ($attachment, ...) # 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, @args) = @_;
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 if (my $cb = delete $registry->[EVENT_OBJECT_INSTANTIATE]) {
263 for (@$cb) {
264 eval { $_->[1]->($obj, @args); };
265 if ($@) {
266 warn "$@";
267 warn "... while processing '$name' instantiate with args <@args>.\n";
268 }
269 }
270 }
271 } else {
272 warn "object uses attachment '$name' that is not available, postponing.\n";
273 }
274
275 push @{$obj->{_attachment}}, $name;
276
277 $res->{attachment} = $name;
278 $res
279}
280
281sub cf::object::attach {
282 my ($obj, $name, @args) = @_;
283
284 _attach_attachment $obj, $name, @args;
285}
286
287sub cf::player::attach {
288 my ($obj, $name, @args) = @_;
289
290 _attach_attachment KLASS_PLAYER, $obj, $name, @args;
291}
292
293sub cf::map::attach {
294 my ($obj, $name, @args) = @_;
295
296 _attach_attachment KLASS_MAP, $obj, $name, @args;
297}
298
299sub attach_global {
300 _attach @CB_GLOBAL, KLASS_GLOBAL, @_
301}
302
303sub attach_to_type {
304 my $type = shift;
305 my $subtype = shift;
306
307 _attach @{$CB_TYPE[$type + $subtype * NUM_SUBTYPES]}, KLASS_OBJECT, @_
308}
309
310sub attach_to_objects {
311 _attach @CB_OBJECT, KLASS_OBJECT, @_
312}
313
314sub attach_to_players {
315 _attach @CB_PLAYER, KLASS_PLAYER, @_
316}
317
318sub attach_to_maps {
319 _attach @CB_MAP, KLASS_MAP, @_
320}
321
322sub register_attachment {
323 my $name = shift;
324
325 $attachment{$name} = [[KLASS_OBJECT, @_]];
326}
327
328our $override;
329our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
330
331sub override {
332 $override = 1;
333 @invoke_results = ();
334}
335
336sub do_invoke {
337 my $event = shift;
338 my $callbacks = shift;
339
340 @invoke_results = ();
341
342 local $override;
343
344 for (@$callbacks) {
345 eval { &{$_->[1]} };
346
347 if ($@) {
348 warn "$@";
349 warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n";
350 override;
351 }
352
353 return 1 if $override;
354 }
355
356 0
357}
358
359#############################################################################
360# object support
361
362sub instantiate {
363 my ($obj, $data) = @_;
364
365 $data = from_json $data;
366
367 for (@$data) {
368 my ($name, $args) = @$_;
369 attach $obj, $name, @{$args || [] };
370 }
371}
372
373# basically do the same as instantiate, without calling instantiate
374sub reattach {
375 my ($obj) = @_;
376 my $registry = $obj->registry;
377
378 @$registry = ();
379
380 for my $name (@{ $obj->{_attachment} }) {
381 if (my $attach = $attachment{$name}) {
382 for (@$attach) {
383 my ($klass, @attach) = @$_;
384 _attach @$registry, $klass, @attach;
385 }
386 } else {
387 warn "object uses attachment '$name' that is not available, postponing.\n";
388 }
389 }
390}
391
392sub object_freezer_save {
393 my ($filename, $objs) = @_;
394
395 $filename .= ".pst";
396
397 if (@$objs) {
398 open my $fh, ">:raw", "$filename~";
399 chmod $fh, SAVE_MODE;
400 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
401 close $fh;
402 rename "$filename~", $filename;
403 } else {
404 unlink $filename;
405 }
406}
407
408sub object_thawer_load {
409 my ($filename) = @_;
410
411 open my $fh, "<:raw:perlio", "$filename.pst"
412 or return;
413
414 eval { local $/; (Storable::thaw <$fh>)->{objs} }
415}
416
417attach_to_objects
418 prio => -1000000,
419 on_clone => sub {
420 my ($src, $dst) = @_;
421
422 @{$dst->registry} = @{$src->registry};
423
424 %$dst = %$src;
425
426 $dst->{_attachment} = [@{ $src->{_attachment} }]
427 if exists $src->{_attachment};
428 },
429;
430
431#############################################################################
432# old plug-in events
433
90sub inject_event { 434sub inject_event {
91 my $extension = shift; 435 my $extension = shift;
92 my $event_code = shift; 436 my $event_code = shift;
93 437
94 my $cb = $hook[$event_code]{$extension} 438 my $cb = $hook[$event_code]{$extension}
136} 480}
137 481
138sub register { 482sub register {
139 my ($base, $pkg) = @_; 483 my ($base, $pkg) = @_;
140 484
141 for my $idx (0 .. $#EVENT) { 485 #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} 486}
148 487
149sub load_extension { 488sub load_extension {
150 my ($path) = @_; 489 my ($path) = @_;
151 490
152 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 491 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
153 my $base = $1; 492 my $base = $1;
154 my $pkg = $1; 493 my $pkg = $1;
155 $pkg =~ s/[^[:word:]]/_/g; 494 $pkg =~ s/[^[:word:]]/_/g;
156 $pkg = "cf::ext::$pkg"; 495 $pkg = "ext::$pkg";
157 496
158 warn "loading '$path' into '$pkg'\n"; 497 warn "loading '$path' into '$pkg'\n";
159 498
160 open my $fh, "<:utf8", $path 499 open my $fh, "<:utf8", $path
161 or die "$path: $!"; 500 or die "$path: $!";
181sub unload_extension { 520sub unload_extension {
182 my ($pkg) = @_; 521 my ($pkg) = @_;
183 522
184 warn "removing extension $pkg\n"; 523 warn "removing extension $pkg\n";
185 524
186 if (my $cb = $pkg->can ("on_unload")) {
187 $cb->($pkg);
188 }
189
190 # remove hooks 525 # remove hooks
526 #TODO
191 for my $idx (0 .. $#EVENT) { 527# for my $idx (0 .. $#PLUGIN_EVENT) {
192 delete $hook[$idx]{$pkg}; 528# delete $hook[$idx]{$pkg};
193 } 529# }
194 530
195 # remove commands 531 # remove commands
196 for my $name (keys %command) { 532 for my $name (keys %command) {
197 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} }; 533 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };
198 534
208 # remove extcmds 544 # remove extcmds
209 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 545 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
210 delete $extcmd{$name}; 546 delete $extcmd{$name};
211 } 547 }
212 548
549 if (my $cb = $pkg->can ("unload")) {
550 eval {
551 $cb->($pkg);
552 1
553 } or warn "$pkg unloaded, but with errors: $@";
554 }
555
213 Symbol::delete_package $pkg; 556 Symbol::delete_package $pkg;
214} 557}
215 558
216sub load_extensions { 559sub load_extensions {
217 my $LIBDIR = maps_directory "perl"; 560 my $LIBDIR = maps_directory "perl";
223 1 566 1
224 } or warn "$ext not loaded: $@"; 567 } or warn "$ext not loaded: $@";
225 } 568 }
226} 569}
227 570
571sub _perl_reload(&) {
572 my ($msg) = @_;
573
574 $msg->("reloading...");
575
576 eval {
577 # 1. cancel all watchers
578 $_->cancel for Event::all_watchers;
579
580 # 2. unload all extensions
581 for (@exts) {
582 $msg->("unloading <$_>");
583 unload_extension $_;
584 }
585
586 # 3. unload all modules loaded from $LIBDIR
587 while (my ($k, $v) = each %INC) {
588 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
589
590 $msg->("removing <$k>");
591 delete $INC{$k};
592
593 $k =~ s/\.pm$//;
594 $k =~ s/\//::/g;
595
596 if (my $cb = $k->can ("unload_module")) {
597 $cb->();
598 }
599
600 Symbol::delete_package $k;
601 }
602
603 # 4. get rid of safe::, as good as possible
604 Symbol::delete_package "safe::$_"
605 for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
606
607 # 5. remove register_script_function callbacks
608 # TODO
609
610 # 6. unload cf.pm "a bit"
611 delete $INC{"cf.pm"};
612
613 # don't, removes xs symbols, too,
614 # and global variables created in xs
615 #Symbol::delete_package __PACKAGE__;
616
617 # 7. reload cf.pm
618 $msg->("reloading cf.pm");
619 require cf;
620 };
621 $msg->($@) if $@;
622
623 $msg->("reloaded");
624};
625
626sub perl_reload() {
627 _perl_reload {
628 warn $_[0];
629 print "$_[0]\n";
630 };
631}
632
228register_command "perl-reload", 0, sub { 633register_command "perl-reload", 0, sub {
229 my ($who, $arg) = @_; 634 my ($who, $arg) = @_;
230 635
231 if ($who->flag (FLAG_WIZ)) { 636 if ($who->flag (FLAG_WIZ)) {
232 $who->message ("reloading..."); 637 _perl_reload {
233 638 warn $_[0];
234 warn "reloading...\n"; 639 $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 }; 640 };
279 warn $@ if $@;
280 $who->message ($@) if $@;
281 warn "reloaded\n";
282
283 $who->message ("reloaded");
284 } else {
285 $who->message ("Intruder Alert!");
286 } 641 }
287}; 642};
288
289#############################################################################
290# utility functions
291
292use JSON::Syck (); # TODO# replace by JSON::PC once working
293
294sub from_json($) {
295 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
296 JSON::Syck::Load $_[0]
297}
298
299sub to_json($) {
300 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
301 JSON::Syck::Dump $_[0]
302}
303 643
304############################################################################# 644#############################################################################
305# extcmd framework, basically convert ext <msg> 645# extcmd framework, basically convert ext <msg>
306# into pkg::->on_extcmd_arg1 (...) while shortcutting a few 646# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
307 647
308sub on_extcmd { 648attach_to_players
649 on_extcmd => sub {
309 my ($pl, $buf) = @_; 650 my ($pl, $buf) = @_;
310 651
311 my $msg = eval { from_json $buf }; 652 my $msg = eval { from_json $buf };
312 653
313 if (ref $msg) { 654 if (ref $msg) {
314 if (my $cb = $extcmd{$msg->{msgtype}}) { 655 if (my $cb = $extcmd{$msg->{msgtype}}) {
315 if (my %reply = $cb->[0]->($pl, $msg)) { 656 if (my %reply = $cb->[0]->($pl, $msg)) {
316 $pl->ext_reply ($msg->{msgid}, %reply); 657 $pl->ext_reply ($msg->{msgid}, %reply);
658 }
317 } 659 }
318 }
319 } else { 660 } else {
320 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 661 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
662 }
663
664 cf::override;
321 } 665 },
322 666;
323 1
324}
325 667
326############################################################################# 668#############################################################################
327# load/save/clean perl data associated with a map 669# load/save/clean perl data associated with a map
328 670
329*on_mapclean = sub { 671*cf::mapsupport::on_clean = sub {
330 my ($map) = @_; 672 my ($map) = @_;
331 673
332 my $path = $map->tmpname; 674 my $path = $map->tmpname;
333 defined $path or return; 675 defined $path or return;
334 676
335 unlink "$path.cfperl"; 677 unlink "$path.cfperl";
678 unlink "$path.pst";
336}; 679};
337 680
338*on_mapin = 681*cf::mapsupport::on_swapin =
339*on_mapload = sub { 682*cf::mapsupport::on_load = sub {
340 my ($map) = @_; 683 my ($map) = @_;
341 684
342 my $path = $map->tmpname; 685 my $path = $map->tmpname;
343 $path = $map->path unless defined $path; 686 $path = $map->path unless defined $path;
344 687
351 or return; # too new 694 or return; # too new
352 695
353 $map->_set_obs ($data->{obs}); 696 $map->_set_obs ($data->{obs});
354}; 697};
355 698
356*on_mapout = sub { 699attach_to_maps prio => -10000, package => cf::mapsupport::;
357 my ($map) = @_;
358
359 my $path = $map->tmpname;
360 $path = $map->path unless defined $path;
361
362 my $obs = $map->_get_obs;
363
364 if (defined $obs) {
365 open my $fh, ">:raw", "$path.cfperl"
366 or die "$path.cfperl: $!";
367
368 stat $path;
369
370 print $fh Storable::nfreeze {
371 size => (stat _)[7],
372 time => (stat _)[9],
373 version => 1,
374 obs => $obs,
375 };
376
377 chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible *g*
378 } else {
379 unlink "$path.cfperl";
380 }
381};
382 700
383############################################################################# 701#############################################################################
384# load/save perl data associated with player->ob objects 702# load/save perl data associated with player->ob objects
385 703
386*on_player_load = sub { 704sub all_objects(@) {
705 @_, map all_objects ($_->inv), @_
706}
707
708attach_to_players
709 on_load => sub {
387 my ($ob, $path) = @_; 710 my ($pl, $path) = @_;
388 711
389 for my $o ($ob, $ob->inv) { 712 for my $o (all_objects $pl->ob) {
390 if (my $value = $o->get_ob_key_value ("_perl_data")) { 713 if (my $value = $o->get_ob_key_value ("_perl_data")) {
391 $o->set_ob_key_value ("_perl_data"); 714 $o->set_ob_key_value ("_perl_data");
392 715
393 %$o = %{ Storable::thaw pack "H*", $value }; 716 %$o = %{ Storable::thaw pack "H*", $value };
394 } 717 }
718 }
395 } 719 },
396}; 720;
397
398*on_player_save = sub {
399 my ($ob, $path) = @_;
400
401 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
402 for grep %$_, $ob, $ob->inv;
403};
404 721
405############################################################################# 722#############################################################################
406# core extensions - in perl 723# core extensions - in perl
407 724
408=item cf::player::exists $login 725=item cf::player::exists $login
454} 771}
455 772
456############################################################################# 773#############################################################################
457# map scripting support 774# map scripting support
458 775
459our $safe = new Safe "ext"; 776our $safe = new Safe "safe";
460our $safe_hole = new Safe::Hole; 777our $safe_hole = new Safe::Hole;
461 778
462$SIG{FPE} = 'IGNORE'; 779$SIG{FPE} = 'IGNORE';
463 780
464$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 781$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
470 ["cf::object::player" => qw(player)], 787 ["cf::object::player" => qw(player)],
471 ["cf::player" => qw(peaceful)], 788 ["cf::player" => qw(peaceful)],
472) { 789) {
473 no strict 'refs'; 790 no strict 'refs';
474 my ($pkg, @funs) = @$_; 791 my ($pkg, @funs) = @$_;
475 *{"ext::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 792 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
476 for @funs; 793 for @funs;
477} 794}
478 795
479sub safe_eval($;@) { 796sub safe_eval($;@) {
480 my ($code, %vars) = @_; 797 my ($code, %vars) = @_;
482 my $qcode = $code; 799 my $qcode = $code;
483 $qcode =~ s/"/‟/g; # not allowed in #line filenames 800 $qcode =~ s/"/‟/g; # not allowed in #line filenames
484 $qcode =~ s/\n/\\n/g; 801 $qcode =~ s/\n/\\n/g;
485 802
486 local $_; 803 local $_;
487 local @ext::cf::_safe_eval_args = values %vars; 804 local @safe::cf::_safe_eval_args = values %vars;
488 805
489 $code = 806 my $eval =
490 "do {\n" 807 "do {\n"
491 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 808 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
492 . "#line 0 \"{$qcode}\"\n" 809 . "#line 0 \"{$qcode}\"\n"
493 . $code 810 . $code
494 . "\n}" 811 . "\n}"
495 ; 812 ;
496 813
497 sub_generation_inc; 814 sub_generation_inc;
498 my @res = wantarray ? $safe->reval ($code) : scalar $safe->reval ($code); 815 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
499 sub_generation_inc; 816 sub_generation_inc;
817
818 if ($@) {
819 warn "$@";
820 warn "while executing safe code '$code'\n";
821 warn "with arguments " . (join " ", %vars) . "\n";
822 }
500 823
501 wantarray ? @res : $res[0] 824 wantarray ? @res : $res[0]
502} 825}
503 826
504sub register_script_function { 827sub register_script_function {
505 my ($fun, $cb) = @_; 828 my ($fun, $cb) = @_;
506 829
507 no strict 'refs'; 830 no strict 'refs';
508 *{"ext::$fun"} = $safe_hole->wrap ($cb); 831 *{"safe::$fun"} = $safe_hole->wrap ($cb);
832}
833
834#############################################################################
835# the server's main()
836
837sub main {
838 Event::loop;
509} 839}
510 840
511############################################################################# 841#############################################################################
512# initialisation 842# initialisation
513 843
515 845
516unshift @INC, $LIBDIR; 846unshift @INC, $LIBDIR;
517 847
518load_extensions; 848load_extensions;
519 849
850$TICK_WATCHER = Event->timer (
851 prio => 1,
852 at => $NEXT_TICK || 1,
853 cb => sub {
854 cf::server_tick; # one server iteration
855
856 my $NOW = Event::time;
857 $NEXT_TICK += $TICK;
858
859 # if we are delayed by four ticks, skip them all
860 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
861
862 $TICK_WATCHER->at ($NEXT_TICK);
863 $TICK_WATCHER->start;
864 },
865);
866
867_reload_2;
868
5201 8691
521 870

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines