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.24 by root, Wed Jul 19 22:51:40 2006 UTC vs.
Revision 1.37 by root, Thu Aug 24 14:05:22 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
15our %COMMAND; 16our %COMMAND;
16our @EVENT; 17our @EVENT;
17our %PROP_TYPE; 18our %PROP_TYPE;
18our %PROP_IDX; 19our %PROP_IDX;
20our $LIBDIR = maps_directory "perl";
21
22our $TICK = MAX_TIME * 1e-6;
23our $TICK_WATCHER;
24our $NEXT_TICK;
19 25
20BEGIN { 26BEGIN {
21 @EVENT = map lc, @EVENT; 27 @EVENT = map lc, @EVENT;
22 28
23 *CORE::GLOBAL::warn = sub { 29 *CORE::GLOBAL::warn = sub {
… …
64prop_gen MAP_PROP => "cf::map"; 70prop_gen MAP_PROP => "cf::map";
65prop_gen ARCH_PROP => "cf::arch"; 71prop_gen ARCH_PROP => "cf::arch";
66 72
67# guessed hierarchies 73# guessed hierarchies
68 74
69@cf::object::player::ISA = 'cf::object'; 75@ext::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
70@cf::object::map::ISA = 'cf::object'; 76@ext::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object';
77
78# we bless all objects into derived classes to force a method lookup
79# within the Safe compartment.
80for my $pkg (qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region cf::arch)) {
81 no strict 'refs';
82 @{"ext::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
83}
71 84
72$Event::DIED = sub { 85$Event::DIED = sub {
73 warn "error in event callback: @_"; 86 warn "error in event callback: @_";
74}; 87};
75 88
… …
172 185
173sub unload_extension { 186sub unload_extension {
174 my ($pkg) = @_; 187 my ($pkg) = @_;
175 188
176 warn "removing extension $pkg\n"; 189 warn "removing extension $pkg\n";
177
178 if (my $cb = $pkg->can ("on_unload")) {
179 $cb->($pkg);
180 }
181 190
182 # remove hooks 191 # remove hooks
183 for my $idx (0 .. $#EVENT) { 192 for my $idx (0 .. $#EVENT) {
184 delete $hook[$idx]{$pkg}; 193 delete $hook[$idx]{$pkg};
185 } 194 }
… …
200 # remove extcmds 209 # remove extcmds
201 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 210 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
202 delete $extcmd{$name}; 211 delete $extcmd{$name};
203 } 212 }
204 213
214 if (my $cb = $pkg->can ("on_unload")) {
215 eval {
216 $cb->($pkg);
217 1
218 } or warn "$pkg unloaded, but with errors: $@";
219 }
220
205 Symbol::delete_package $pkg; 221 Symbol::delete_package $pkg;
206} 222}
207 223
208sub load_extensions { 224sub load_extensions {
209 my $LIBDIR = maps_directory "perl"; 225 my $LIBDIR = maps_directory "perl";
… …
215 1 231 1
216 } or warn "$ext not loaded: $@"; 232 } or warn "$ext not loaded: $@";
217 } 233 }
218} 234}
219 235
236sub _perl_reload(&) {
237 my ($msg) = @_;
238
239 $msg->("reloading...");
240
241 eval {
242 # 1. cancel all watchers
243 $_->cancel for Event::all_watchers;
244
245 # 2. unload all extensions
246 for (@exts) {
247 $msg->("unloading <$_>");
248 unload_extension $_;
249 }
250
251 # 3. unload all modules loaded from $LIBDIR
252 while (my ($k, $v) = each %INC) {
253 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
254
255 $msg->("removing <$k>");
256 delete $INC{$k};
257
258 $k =~ s/\.pm$//;
259 $k =~ s/\//::/g;
260
261 if (my $cb = $k->can ("unload_module")) {
262 $cb->();
263 }
264
265 Symbol::delete_package $k;
266 }
267
268 # 4. get rid of ext::, as good as possible
269 Symbol::delete_package "ext::$_"
270 for qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region);
271
272 # 5. remove register_script_function callbacks
273 # TODO
274
275 # 6. unload cf.pm "a bit"
276 delete $INC{"cf.pm"};
277
278 # don't, removes xs symbols, too
279 #Symbol::delete_package __PACKAGE__;
280
281 # 7. reload cf.pm
282 $msg->("reloading cf.pm");
283 require cf;
284 };
285 $msg->($@) if $@;
286
287 $msg->("reloaded");
288};
289
290sub perl_reload() {
291 _perl_reload {
292 warn $_[0];
293 print "$_[0]\n";
294 };
295}
296
220register_command "perl-reload", 0, sub { 297register_command "perl-reload", 0, sub {
221 my ($who, $arg) = @_; 298 my ($who, $arg) = @_;
222 299
223 if ($who->flag (FLAG_WIZ)) { 300 if ($who->flag (FLAG_WIZ)) {
224 $who->message ("reloading..."); 301 _perl_reload {
225 302 warn $_[0];
226 warn "reloading...\n"; 303 $who->message ($_[0]);
227 eval {
228 $_->cancel for Event::all_watchers;
229
230 unload_extension $_ for @exts;
231 delete $INC{"cf.pm"};
232
233 # don't, removes xs symbols, too
234 #Symbol::delete_package __PACKAGE__;
235
236 require cf;
237 }; 304 };
238 warn $@ if $@;
239 $who->message ($@) if $@;
240 warn "reloaded\n";
241
242 $who->message ("reloaded");
243 } else {
244 $who->message ("Intruder Alert!");
245 } 305 }
246}; 306};
247 307
248############################################################################# 308#############################################################################
309# utility functions
310
311use JSON::Syck (); # TODO# replace by JSON::PC once working
312
313sub from_json($) {
314 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
315 JSON::Syck::Load $_[0]
316}
317
318sub to_json($) {
319 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
320 JSON::Syck::Dump $_[0]
321}
322
323#############################################################################
249# extcmd framework, basically convert ext <id> <pkg> arg1 args 324# extcmd framework, basically convert ext <msg>
250# into pkg::->on_extcmd_arg1 (...) while shortcutting a few 325# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
251 326
252sub on_extcmd { 327sub on_extcmd {
253 my ($pl, $buf) = @_; 328 my ($pl, $buf) = @_;
254 329
255 my ($type) = $buf =~ s/^(\S+) // ? $1 : ""; 330 my $msg = eval { from_json $buf };
256 331
257 $extcmd{$type}[0]->($pl, $buf) 332 if (ref $msg) {
258 if $extcmd{$type}; 333 if (my $cb = $extcmd{$msg->{msgtype}}) {
334 if (my %reply = $cb->[0]->($pl, $msg)) {
335 $pl->ext_reply ($msg->{msgid}, %reply);
336 }
337 }
338 } else {
339 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
340 }
341
342 1
259} 343}
260 344
261############################################################################# 345#############################################################################
262# load/save/clean perl data associated with a map 346# load/save/clean perl data associated with a map
263 347
… …
316}; 400};
317 401
318############################################################################# 402#############################################################################
319# load/save perl data associated with player->ob objects 403# load/save perl data associated with player->ob objects
320 404
405sub all_objects(@) {
406 @_, map all_objects ($_->inv), @_
407}
408
321*on_player_load = sub { 409*on_player_load = sub {
322 my ($ob, $path) = @_; 410 my ($ob, $path) = @_;
323 411
324 if (open my $fh, "<:raw", "$path.cfperl") { 412 for my $o (all_objects $ob) {
325
326 #d##TODO#remove
327
328 my $data = Storable::thaw do { local $/; <$fh> };
329
330 $data->{version} <= 1
331 or return; # too new
332
333 %$ob = %{$data->{ob}};
334 return;
335 }
336
337 for my $o ($ob, $ob->inv) {
338 if (my $value = $o->get_ob_key_value ("_perl_data")) { 413 if (my $value = $o->get_ob_key_value ("_perl_data")) {
339 $o->set_ob_key_value ("_perl_data"); 414 $o->set_ob_key_value ("_perl_data");
340 415
341 %$o = %{ Storable::thaw pack "H*", $value }; 416 %$o = %{ Storable::thaw pack "H*", $value };
342 } 417 }
… …
345 420
346*on_player_save = sub { 421*on_player_save = sub {
347 my ($ob, $path) = @_; 422 my ($ob, $path) = @_;
348 423
349 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_) 424 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
350 for grep %$_, $ob, $ob->inv; 425 for grep %$_, all_objects $ob;
351
352 unlink "$path.cfperl";#d##TODO#remove
353}; 426};
354 427
355############################################################################# 428#############################################################################
356# core extensions - in perl 429# core extensions - in perl
357 430
… …
363 436
364sub cf::player::exists($) { 437sub cf::player::exists($) {
365 cf::player::find $_[0] 438 cf::player::find $_[0]
366 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 439 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;
367} 440}
441
442=item $player->reply ($npc, $msg[, $flags])
443
444Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
445can be C<undef>. Does the right thing when the player is currently in a
446dialogue with the given NPC character.
447
448=cut
368 449
369# rough implementation of a future "reply" method that works 450# rough implementation of a future "reply" method that works
370# with dialog boxes. 451# with dialog boxes.
371sub cf::object::player::reply($$$;$) { 452sub cf::object::player::reply($$$;$) {
372 my ($self, $npc, $msg, $flags) = @_; 453 my ($self, $npc, $msg, $flags) = @_;
… …
379 $msg = $npc->name . " says: $msg" if $npc; 460 $msg = $npc->name . " says: $msg" if $npc;
380 $self->message ($msg, $flags); 461 $self->message ($msg, $flags);
381 } 462 }
382} 463}
383 464
465=item $player->ext_reply ($msgid, $msgtype, %msg)
466
467Sends an ext reply to the player.
468
469=cut
470
471sub cf::player::ext_reply($$$%) {
472 my ($self, $id, %msg) = @_;
473
474 $msg{msgid} = $id;
475
476 $self->send ("ext " . to_json \%msg);
477}
478
384############################################################################# 479#############################################################################
385# map scripting support 480# map scripting support
386 481
387our $safe = new Safe "ext"; 482our $safe = new Safe "ext";
388our $safe_hole = new Safe::Hole; 483our $safe_hole = new Safe::Hole;
389 484
390$SIG{FPE} = 'IGNORE'; 485$SIG{FPE} = 'IGNORE';
391 486
392$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 487$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
393 488
394# here we would export the classes and methods available to script code 489# here we export the classes and methods available to script code
395#@ext::cf::object::player::ISA = @cf::object::player::ISA; 490
396#@ext::cf::object::map::ISA = @cf::object::map::ISA; 491for (
492 ["cf::object" => qw(contr pay_amount pay_player)],
493 ["cf::object::player" => qw(player)],
494 ["cf::player" => qw(peaceful)],
495) {
496 no strict 'refs';
497 my ($pkg, @funs) = @$_;
498 *{"ext::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
499 for @funs;
500}
397 501
398sub safe_eval($;@) { 502sub safe_eval($;@) {
399 my ($code, %vars) = @_; 503 my ($code, %vars) = @_;
400 504
401 my $qcode = $code; 505 my $qcode = $code;
… …
403 $qcode =~ s/\n/\\n/g; 507 $qcode =~ s/\n/\\n/g;
404 508
405 local $_; 509 local $_;
406 local @ext::cf::_safe_eval_args = values %vars; 510 local @ext::cf::_safe_eval_args = values %vars;
407 511
408 $safe->reval ( 512 $code =
409 "do {\n" 513 "do {\n"
410 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 514 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
411 . "#line 0 \"{$qcode}\"\n" 515 . "#line 0 \"{$qcode}\"\n"
412 . $code 516 . $code
413 . "\n}" 517 . "\n}"
414 ) 518 ;
519
520 sub_generation_inc;
521 my @res = wantarray ? $safe->reval ($code) : scalar $safe->reval ($code);
522 sub_generation_inc;
523
524 wantarray ? @res : $res[0]
415} 525}
416 526
417sub register_script_function { 527sub register_script_function {
418 my ($fun, $cb) = @_; 528 my ($fun, $cb) = @_;
419 529
420 no strict 'refs'; 530 no strict 'refs';
421 *{"ext::$fun"} = $safe_hole->wrap ($cb); 531 *{"ext::$fun"} = $safe_hole->wrap ($cb);
422} 532}
423 533
424############################################################################# 534#############################################################################
535# the server's main()
536
537sub run {
538 Event::loop;
539}
540
541#############################################################################
425# initialisation 542# initialisation
426 543
427register "<global>", __PACKAGE__; 544register "<global>", __PACKAGE__;
428 545
429unshift @INC, maps_directory "perl"; 546unshift @INC, $LIBDIR;
430 547
431load_extensions; 548load_extensions;
432 549
550$TICK_WATCHER = Event->timer (
551 prio => 1,
552 at => $NEXT_TICK || 1,
553 cb => sub {
554 cf::server_tick; # one server iteration
555
556 my $NOW = Event::time;
557 $NEXT_TICK += $TICK;
558
559 # if we are delayed by four ticks, skip them all
560 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
561
562 $TICK_WATCHER->at ($NEXT_TICK);
563 $TICK_WATCHER->start;
564 },
565);
566
4331 5671
434 568

Diff Legend

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