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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines