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

Diff Legend

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