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.284 by root, Sun Jun 24 04:15:42 2007 UTC vs.
Revision 1.395 by root, Sat Nov 10 22:41:59 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
26use JSON::XS ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
49our %COMMAND = (); 52our %COMMAND = ();
50our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
51 54
52our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
56 60
57our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
58our @EVENT; 62our @EVENT;
76our $NEXT_TICK; 80our $NEXT_TICK;
77our $NOW; 81our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
79 83
80our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 88our $DB_ENV;
82 89
83our %CFG; 90our %CFG;
84 91
85our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 93our $RUNTIME;
87 94
88our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
91 98
92# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 101
155 162
156The raw value load value from the last tick. 163The raw value load value from the last tick.
157 164
158=item %cf::CFG 165=item %cf::CFG
159 166
160Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 168from wherever your confdir points to.
162 169
163=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
164 171
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 173returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
169=back 182=back
170 183
171=cut 184=cut
172 185
173BEGIN { 186BEGIN {
177 $msg .= "\n" 190 $msg .= "\n"
178 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
179 192
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 194
182 utf8::encode $msg;
183 LOG llevError, $msg; 195 LOG llevError, $msg;
184 }; 196 };
185} 197}
186 198
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 249 $d
238 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
239} 251}
240 252
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 253=item $ref = cf::from_json $json
244 254
245Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
246 256
247=item $json = cf::to_json $ref 257=item $json = cf::to_json $ref
248 258
249Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260
261=cut
262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264
265sub to_json ($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) }
250 267
251=item cf::lock_wait $string 268=item cf::lock_wait $string
252 269
253Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
254 271
257Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
258a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
259for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
260returned. 277returned.
261 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
262Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
263uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
264 284
265=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
266 286
267Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
268 288
269=cut 289=cut
270 290
271our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
272 293
273sub lock_wait($) { 294sub lock_wait($) {
274 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
275 301
276 # wait for lock, if any 302 # wait for lock, if any
277 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule; 305 Coro::schedule;
285 311
286 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
287 lock_wait $key; 313 lock_wait $key;
288 314
289 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
290 317
291 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
292 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
294 } 322 }
295} 323}
296 324
308 }; 336 };
309 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
310 $guard 338 $guard
311} 339}
312 340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
361 my $signal = new Coro::Signal;
362
363 while () {
364 next_job:
365 my $avail = cf::till_tick;
366 if ($avail > 0.01) {
367 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) {
369 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send;
371 Coro::cede;
372 goto next_job;
373 }
374 }
375 }
376
377 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait;
381 } else {
382 Coro::schedule;
383 }
384 }
385};
386
387sub get_slot($;$$) {
388 my ($time, $pri, $name) = @_;
389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready;
396 $sig->wait;
397}
398
313=item cf::async { BLOCK } 399=item cf::async { BLOCK }
314 400
315Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
316C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 402C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
317thing you are allowed to do is call C<prio> on it. 403thing you are allowed to do is call C<prio> on it.
320 406
321BEGIN { *async = \&Coro::async_pool } 407BEGIN { *async = \&Coro::async_pool }
322 408
323=item cf::sync_job { BLOCK } 409=item cf::sync_job { BLOCK }
324 410
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 411The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 412is always able to handle events or runnable, as Deliantra is only
327partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable. 414acceptable.
329 415
330If it must be done, put the blocking parts into C<sync_job>. This will run 416If it must be done, put the blocking parts into C<sync_job>. This will run
331the given BLOCK in another coroutine while waiting for the result. The 417the given BLOCK in another coroutine while waiting for the result. The
341 my $time = Event::time; 427 my $time = Event::time;
342 428
343 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
345 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
346 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
347 # (but this is cancel-safe) 435 # (but this is cancel-safe)
348 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
349 437
350 my $busy = 1; 438 my $busy = 1;
351 my @res; 439 my @res;
352 440
353 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 443 @res = eval { $job->() };
355 warn $@ if $@; 444 warn $@ if $@;
356 undef $busy; 445 undef $busy;
357 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
358 447
359 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
360 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
361 } 454 }
362 455
363 $time = Event::time - $time; 456 $time = Event::time - $time;
364 457
365 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
405=cut 498=cut
406 499
407sub fork_call(&@) { 500sub fork_call(&@) {
408 my ($cb, @args) = @_; 501 my ($cb, @args) = @_;
409 502
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 503 # we seemingly have to make a local copy of the whole thing,
411# or die "socketpair: $!"; 504 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 505 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 506
415 if (my $pid = fork) { 507 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 508 reset_signals;
428 local $SIG{__WARN__}; 509 &$cb
429 local $SIG{__DIE__}; 510 }, @args;
430 eval {
431 close $fh1;
432 511
433 my @res = eval { $cb->(@args) }; 512 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435 };
436
437 warn $@ if $@;
438 _exit 0;
439 }
440} 513}
441 514
442=item $value = cf::db_get $family => $key 515=item $value = cf::db_get $family => $key
443 516
444Returns a single value from the environment database. 517Returns a single value from the environment database.
446=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
447 520
448Stores the given C<$value> in the family. It can currently store binary 521Stores the given C<$value> in the family. It can currently store binary
449data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450 523
524=item $db = cf::db_table "name"
525
526Create and/or open a new database table. The string must not be "db" and must be unique
527within each server.
528
451=cut 529=cut
530
531sub db_table($) {
532 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV;
534
535 eval {
536 $db->set_flags (BDB::CHKSUM);
537
538 utf8::encode $name;
539 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
540 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
541 cf::cleanup "db_open(db): $!" if $!;
542 };
543 cf::cleanup "db_open(db): $@" if $@;
544
545 $db
546}
452 547
453our $DB; 548our $DB;
454 549
455sub db_init { 550sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 551 cf::sync_job {
460 eval { 552 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 553 };
470} 554}
471 555
472sub db_get($$) { 556sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
474 558
524 if (1) { 608 if (1) {
525 $md5 = 609 $md5 =
526 join "\x00", 610 join "\x00",
527 $processversion, 611 $processversion,
528 map { 612 map {
529 Coro::cede; 613 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 615 } 0.. $#$src;
532 616
533 617
534 my $dbmd5 = db_get cache => "$id/md5"; 618 my $dbmd5 = db_get cache => "$id/md5";
578attach callbacks/event handlers (a collection of which is called an "attachment") 662attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 663to it. All such attachable objects support the following methods.
580 664
581In the following description, CLASS can be any of C<global>, C<object> 665In the following description, CLASS can be any of C<global>, C<object>
582C<player>, C<client> or C<map> (i.e. the attachable objects in 666C<player>, C<client> or C<map> (i.e. the attachable objects in
583Crossfire TRT). 667Deliantra).
584 668
585=over 4 669=over 4
586 670
587=item $attachable->attach ($attachment, key => $value...) 671=item $attachable->attach ($attachment, key => $value...)
588 672
840 "; 924 ";
841 die if $@; 925 die if $@;
842} 926}
843 927
844our $override; 928our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 929our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 930
847sub override { 931sub override {
848 $override = 1; 932 $override = 1;
849 @invoke_results = (); 933 @INVOKE_RESULTS = (@_);
850} 934}
851 935
852sub do_invoke { 936sub do_invoke {
853 my $event = shift; 937 my $event = shift;
854 my $callbacks = shift; 938 my $callbacks = shift;
855 939
856 @invoke_results = (); 940 @INVOKE_RESULTS = ();
857 941
858 local $override; 942 local $override;
859 943
860 for (@$callbacks) { 944 for (@$callbacks) {
861 eval { &{$_->[1]} }; 945 eval { &{$_->[1]} };
878 962
879Generate an object-specific event with the given arguments. 963Generate an object-specific event with the given arguments.
880 964
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 965This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 966removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 967results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 968
885=back 969=back
886 970
887=cut 971=cut
888 972
889############################################################################# 973#############################################################################
890# object support 974# object support
975
976sub _object_equal($$);
977sub _object_equal($$) {
978 my ($a, $b) = @_;
979
980 return 0 unless (ref $a) eq (ref $b);
981
982 if ("HASH" eq ref $a) {
983 my @ka = keys %$a;
984 my @kb = keys %$b;
985
986 return 0 if @ka != @kb;
987
988 for (0 .. $#ka) {
989 return 0 unless $ka[$_] eq $kb[$_];
990 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
991 }
992
993 } elsif ("ARRAY" eq ref $a) {
994
995 return 0 if @$a != @$b;
996
997 for (0 .. $#$a) {
998 return 0 unless _object_equal $a->[$_], $b->[$_];
999 }
1000
1001 } elsif ($a ne $b) {
1002 return 0;
1003 }
1004
1005 1
1006}
1007
1008our $SLOW_MERGES;#d#
1009sub _can_merge {
1010 my ($ob1, $ob2) = @_;
1011
1012 ++$SLOW_MERGES;#d#
1013
1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
1016}
891 1017
892sub reattach { 1018sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1020 my ($obj) = @_;
895 1021
942sub object_freezer_save { 1068sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
944 1070
945 sync_job { 1071 sync_job {
946 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
949 1076
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1081 close $fh;
955 1082
956 if (@$objs) { 1083 if (@$objs) {
957 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1089 close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
964 } 1091 }
972 } 1099 }
973 } else { 1100 } else {
974 aio_unlink $filename; 1101 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
976 } 1103 }
977 } 1104 };
978} 1105}
979 1106
980sub object_freezer_as_string { 1107sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
982 1109
994 or return; 1121 or return;
995 1122
996 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
998 or return; 1125 or return;
1126
999 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1000 } 1129 }
1001 1130
1131 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1134
1004 return ($data, $av); 1135 ($data, $av)
1005} 1136}
1006 1137
1007=head2 COMMAND CALLBACKS 1138=head2 COMMAND CALLBACKS
1008 1139
1009=over 4 1140=over 4
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1160 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1161}
1031 1162
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1163=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1164
1034Register a callback fro execution when the client sends an extcmd packet. 1165Register a callback for execution when the client sends an (synchronous)
1166extcmd packet. Ext commands will be processed in the order they are
1167received by the server, like other user commands. The first argument is
1168the logged-in player. Ext commands can only be processed after a player
1169has logged in successfully.
1035 1170
1036If the callback returns something, it is sent back as if reply was being 1171If the callback returns something, it is sent back as if reply was being
1037called. 1172called.
1038 1173
1174=item cf::register_exticmd $name => \&callback($ns,$packet);
1175
1176Register a callback for execution when the client sends an (asynchronous)
1177exticmd packet. Exti commands are processed by the server as soon as they
1178are received, i.e. out of order w.r.t. other commands. The first argument
1179is a client socket. Exti commands can be received anytime, even before
1180log-in.
1181
1182If the callback returns something, it is sent back as if reply was being
1183called.
1184
1039=cut 1185=cut
1040 1186
1041sub register_extcmd { 1187sub register_extcmd {
1042 my ($name, $cb) = @_; 1188 my ($name, $cb) = @_;
1043 1189
1044 $EXTCMD{$name} = $cb; 1190 $EXTCMD{$name} = $cb;
1191}
1192
1193sub register_exticmd {
1194 my ($name, $cb) = @_;
1195
1196 $EXTICMD{$name} = $cb;
1045} 1197}
1046 1198
1047cf::player->attach ( 1199cf::player->attach (
1048 on_command => sub { 1200 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1201 my ($pl, $name, $params) = @_;
1058 cf::override; 1210 cf::override;
1059 }, 1211 },
1060 on_extcmd => sub { 1212 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1213 my ($pl, $buf) = @_;
1062 1214
1063 my $msg = eval { from_json $buf }; 1215 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1216
1065 if (ref $msg) { 1217 if (ref $msg) {
1218 my ($type, $reply, @payload) =
1219 "ARRAY" eq ref $msg
1220 ? @$msg
1221 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1222
1223 my @reply;
1224
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1225 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1226 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1227 }
1228
1229 $pl->ext_reply ($reply, @reply)
1230 if $reply;
1231
1071 } else { 1232 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1234 }
1074 1235
1075 cf::override; 1236 cf::override;
1165 1326
1166=head3 cf::player 1327=head3 cf::player
1167 1328
1168=over 4 1329=over 4
1169 1330
1331=item cf::player::num_playing
1332
1333Returns the official number of playing players, as per the Crossfire metaserver rules.
1334
1335=cut
1336
1337sub num_playing {
1338 scalar grep
1339 $_->ob->map
1340 && !$_->hidden
1341 && !$_->ob->flag (cf::FLAG_WIZ),
1342 cf::player::list
1343}
1344
1170=item cf::player::find $login 1345=item cf::player::find $login
1171 1346
1172Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1173 1348
1174=cut 1349=cut
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1388
1214 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1215 or return; 1390 or return;
1391
1392 my $pl = cf::player::load_pl $f
1393 or return;
1394 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs;
1216 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1217 } 1397 }
1218 } 1398 }
1219} 1399}
1220 1400
1230 1410
1231 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1233 1413
1234 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1235 Coro::cede; 1415 cf::cede_to_tick;
1236} 1416}
1237 1417
1238sub new($) { 1418sub new($) {
1239 my ($login) = @_; 1419 my ($login) = @_;
1240 1420
1244 $self->{deny_save} = 1; 1424 $self->{deny_save} = 1;
1245 1425
1246 $cf::PLAYER{$login} = $self; 1426 $cf::PLAYER{$login} = $self;
1247 1427
1248 $self 1428 $self
1429}
1430
1431=item $player->send_msg ($channel, $msg, $color, [extra...])
1432
1433=cut
1434
1435sub send_msg {
1436 my $ns = shift->ns
1437 or return;
1438 $ns->send_msg (@_);
1249} 1439}
1250 1440
1251=item $pl->quit_character 1441=item $pl->quit_character
1252 1442
1253Nukes the player without looking back. If logged in, the connection will 1443Nukes the player without looking back. If logged in, the connection will
1308 or return []; 1498 or return [];
1309 1499
1310 my @logins; 1500 my @logins;
1311 1501
1312 for my $login (@$dirs) { 1502 for my $login (@$dirs) {
1503 my $path = path $login;
1504
1505 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1316 1511
1317 utf8::decode $login; 1512 utf8::decode $login;
1318 push @logins, $login; 1513 push @logins, $login;
1319 } 1514 }
1320 1515
1353 1548
1354Expand crossfire pod fragments into protocol xml. 1549Expand crossfire pod fragments into protocol xml.
1355 1550
1356=cut 1551=cut
1357 1552
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1358sub expand_cfpod { 1564sub expand_cfpod {
1359 ((my $self), (local $_)) = @_; 1565 my ($self, $pod) = @_;
1360 1566
1361 # escape & and < 1567 my $xml;
1362 s/&/&amp;/g;
1363 s/(?<![BIUGH])</&lt;/g;
1364 1568
1365 # this is buggy, it needs to properly take care of nested <'s 1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1366 1572
1367 1 while 1573 $group =~ s/&/&amp;/g;
1368 # replace B<>, I<>, U<> etc. 1574 $group =~ s/</&lt;/g;
1369 s/B<([^\>]*)>/<b>$1<\/b>/ 1575
1370 || s/I<([^\>]*)>/<i>$1<\/i>/ 1576 $xml .= $group;
1371 || s/U<([^\>]*)>/<u>$1<\/u>/ 1577 } elsif ($pod =~ m%\G
1372 # replace G<male|female> tags 1578 ([BCGHITU])
1373 || s{G<([^>|]*)\|([^>]*)>}{ 1579 <
1374 $self->gender ? $2 : $1 1580 (?:
1581 ([^<>]*) (?{ $group = $^N })
1582 | < $interior >
1583 )
1584 >
1585 %gcsx
1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1606 "")
1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1375 }ge 1616 }
1376 # replace H<hint text> 1617 }
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1378 1618
1619 for ($xml) {
1379 # create single paragraphs (very hackish) 1620 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g; 1621 s/(?<=\S)\n(?=\w)/ /g;
1381 1622
1382 $_ 1623 # compress some whitespace
1383} 1624 s/\s+\n/\n/g; # ws line-ends
1625 s/\n\n+/\n/g; # double lines
1626 s/^\n+//; # beginning lines
1627 s/\n+$//; # ending lines
1628 }
1384 1629
1630 $xml
1631}
1632
1633no re 'eval';
1634
1635sub hintmode {
1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1637 $_[0]{hintmode}
1638}
1639
1385=item $player->ext_reply ($msgid, %msg) 1640=item $player->ext_reply ($msgid, @msg)
1386 1641
1387Sends an ext reply to the player. 1642Sends an ext reply to the player.
1388 1643
1389=cut 1644=cut
1390 1645
1391sub ext_reply($$%) { 1646sub ext_reply($$@) {
1392 my ($self, $id, %msg) = @_; 1647 my ($self, $id, @msg) = @_;
1393 1648
1394 $msg{msgid} = $id; 1649 $self->ns->ext_reply ($id, @msg)
1395
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1650}
1398 1651
1399=item $player->ext_event ($type, %msg) 1652=item $player->ext_msg ($type, @msg)
1400 1653
1401Sends an ext event to the client. 1654Sends an ext event to the client.
1402 1655
1403=cut 1656=cut
1404 1657
1405sub ext_event($$%) { 1658sub ext_msg($$@) {
1406 my ($self, $type, %msg) = @_; 1659 my ($self, $type, @msg) = @_;
1407 1660
1408 $self->ns->ext_event ($type, %msg); 1661 $self->ns->ext_msg ($type, @msg);
1409} 1662}
1410 1663
1411=head3 cf::region 1664=head3 cf::region
1412 1665
1413=over 4 1666=over 4
1426 my ($path) = @_; 1679 my ($path) = @_;
1427 1680
1428 my ($match, $specificity); 1681 my ($match, $specificity);
1429 1682
1430 for my $region (list) { 1683 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1684 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1685 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1686 if $region->specificity > $specificity;
1434 } 1687 }
1435 } 1688 }
1436 1689
1556 $self->init; # pass $1 etc. 1809 $self->init; # pass $1 etc.
1557 return $self; 1810 return $self;
1558 } 1811 }
1559 } 1812 }
1560 1813
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 1814 Carp::cluck "unable to resolve path '$path' (base '$base').";
1562 () 1815 ()
1563} 1816}
1564 1817
1565sub init { 1818sub init {
1566 my ($self) = @_; 1819 my ($self) = @_;
1629 1882
1630sub load_header_from($) { 1883sub load_header_from($) {
1631 my ($self, $path) = @_; 1884 my ($self, $path) = @_;
1632 1885
1633 utf8::encode $path; 1886 utf8::encode $path;
1634 #aio_open $path, O_RDONLY, 0 1887 my $f = new_from_file cf::object::thawer $path
1635 # or return;
1636
1637 $self->_load_header ($path)
1638 or return; 1888 or return;
1889
1890 $self->_load_header ($f)
1891 or return;
1892
1893 local $MAP_LOADING{$self->{path}} = $self;
1894 $f->resolve_delayed_derefs;
1639 1895
1640 $self->{load_path} = $path; 1896 $self->{load_path} = $path;
1641 1897
1642 1 1898 1
1643} 1899}
1697sub find { 1953sub find {
1698 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1699 1955
1700 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1701 1957
1958 cf::lock_wait "map_data:$path";#d#remove
1702 cf::lock_wait "map_find:$path"; 1959 cf::lock_wait "map_find:$path";
1703 1960
1704 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1705 my $guard = cf::lock_acquire "map_find:$path"; 1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1964
1706 my $map = new_from_path cf::map $path 1965 my $map = new_from_path cf::map $path
1707 or return; 1966 or return;
1708 1967
1709 $map->{last_save} = $cf::RUNTIME; 1968 $map->{last_save} = $cf::RUNTIME;
1710 1969
1712 or return; 1971 or return;
1713 1972
1714 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715 # doing this can freeze the server in a sync job, obviously 1974 # doing this can freeze the server in a sync job, obviously
1716 #$cf::WAIT_FOR_TICK->wait; 1975 #$cf::WAIT_FOR_TICK->wait;
1976 undef $guard1;
1977 undef $guard2;
1717 $map->reset; 1978 $map->reset;
1718 undef $guard;
1719 return find $path; 1979 return find $path;
1720 } 1980 }
1721 1981
1722 $cf::MAP{$path} = $map 1982 $cf::MAP{$path} = $map
1723 } 1983 }
1732 local $self->{deny_reset} = 1; # loading can take a long time 1992 local $self->{deny_reset} = 1; # loading can take a long time
1733 1993
1734 my $path = $self->{path}; 1994 my $path = $self->{path};
1735 1995
1736 { 1996 {
1737 my $guard = cf::lock_acquire "map_load:$path"; 1997 my $guard = cf::lock_acquire "map_data:$path";
1738 1998
1999 return unless $self->valid;
1739 return if $self->in_memory != cf::MAP_SWAPPED; 2000 return unless $self->in_memory == cf::MAP_SWAPPED;
1740 2001
1741 $self->in_memory (cf::MAP_LOADING); 2002 $self->in_memory (cf::MAP_LOADING);
1742 2003
1743 $self->alloc; 2004 $self->alloc;
1744 2005
1745 $self->pre_load; 2006 $self->pre_load;
1746 Coro::cede; 2007 cf::cede_to_tick;
1747 2008
2009 my $f = new_from_file cf::object::thawer $self->{load_path};
2010 $f->skip_block;
1748 $self->_load_objects ($self->{load_path}, 1) 2011 $self->_load_objects ($f)
1749 or return; 2012 or return;
1750 2013
1751 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2014 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1752 if delete $self->{load_original}; 2015 if delete $self->{load_original};
1753 2016
1754 if (my $uniq = $self->uniq_path) { 2017 if (my $uniq = $self->uniq_path) {
1755 utf8::encode $uniq; 2018 utf8::encode $uniq;
1756 if (aio_open $uniq, O_RDONLY, 0) { 2019 unless (aio_stat $uniq) {
2020 if (my $f = new_from_file cf::object::thawer $uniq) {
1757 $self->clear_unique_items; 2021 $self->clear_unique_items;
1758 $self->_load_objects ($uniq, 0); 2022 $self->_load_objects ($f);
2023 $f->resolve_delayed_derefs;
2024 }
1759 } 2025 }
1760 } 2026 }
1761 2027
1762 Coro::cede; 2028 $f->resolve_delayed_derefs;
2029
2030 cf::cede_to_tick;
1763 # now do the right thing for maps 2031 # now do the right thing for maps
1764 $self->link_multipart_objects; 2032 $self->link_multipart_objects;
1765 $self->difficulty ($self->estimate_difficulty) 2033 $self->difficulty ($self->estimate_difficulty)
1766 unless $self->difficulty; 2034 unless $self->difficulty;
1767 Coro::cede; 2035 cf::cede_to_tick;
1768 2036
1769 unless ($self->{deny_activate}) { 2037 unless ($self->{deny_activate}) {
1770 $self->decay_objects; 2038 $self->decay_objects;
1771 $self->fix_auto_apply; 2039 $self->fix_auto_apply;
1772 $self->update_buttons; 2040 $self->update_buttons;
1773 Coro::cede; 2041 cf::cede_to_tick;
1774 $self->set_darkness_map; 2042 $self->set_darkness_map;
1775 Coro::cede; 2043 cf::cede_to_tick;
1776 $self->activate; 2044 $self->activate;
1777 } 2045 }
2046
2047 $self->{last_save} = $cf::RUNTIME;
2048 $self->last_access ($cf::RUNTIME);
1778 2049
1779 $self->in_memory (cf::MAP_IN_MEMORY); 2050 $self->in_memory (cf::MAP_IN_MEMORY);
1780 } 2051 }
1781 2052
1782 $self->post_load; 2053 $self->post_load;
1793 2064
1794 $self 2065 $self
1795} 2066}
1796 2067
1797# find and load all maps in the 3x3 area around a map 2068# find and load all maps in the 3x3 area around a map
1798sub load_diag { 2069sub load_neighbours {
1799 my ($map) = @_; 2070 my ($map) = @_;
1800 2071
1801 my @diag; # diagonal neighbours 2072 my @neigh; # diagonal neighbours
1802 2073
1803 for (0 .. 3) { 2074 for (0 .. 3) {
1804 my $neigh = $map->tile_path ($_) 2075 my $neigh = $map->tile_path ($_)
1805 or next; 2076 or next;
1806 $neigh = find $neigh, $map 2077 $neigh = find $neigh, $map
1807 or next; 2078 or next;
1808 $neigh->load; 2079 $neigh->load;
1809 2080
2081 push @neigh,
1810 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2082 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1811 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2083 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1812 } 2084 }
1813 2085
1814 for (@diag) { 2086 for (grep defined $_->[0], @neigh) {
2087 my ($path, $origin) = @$_;
1815 my $neigh = find @$_ 2088 my $neigh = find $path, $origin
1816 or next; 2089 or next;
1817 $neigh->load; 2090 $neigh->load;
1818 } 2091 }
1819} 2092}
1820 2093
1825} 2098}
1826 2099
1827sub do_load_sync { 2100sub do_load_sync {
1828 my ($map) = @_; 2101 my ($map) = @_;
1829 2102
2103 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2104 if $Coro::current == $Coro::main;
2105
1830 cf::sync_job { $map->load }; 2106 cf::sync_job { $map->load };
1831} 2107}
1832 2108
1833our %MAP_PREFETCH; 2109our %MAP_PREFETCH;
1834our $MAP_PREFETCHER = undef; 2110our $MAP_PREFETCHER = undef;
1835 2111
1836sub find_async { 2112sub find_async {
1837 my ($path, $origin) = @_; 2113 my ($path, $origin, $load) = @_;
1838 2114
1839 $path = normalise $path, $origin && $origin->{path}; 2115 $path = normalise $path, $origin && $origin->{path};
1840 2116
1841 if (my $map = $cf::MAP{$path}) { 2117 if (my $map = $cf::MAP{$path}) {
1842 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2118 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1843 } 2119 }
1844 2120
1845 undef $MAP_PREFETCH{$path}; 2121 $MAP_PREFETCH{$path} |= $load;
2122
1846 $MAP_PREFETCHER ||= cf::async { 2123 $MAP_PREFETCHER ||= cf::async {
2124 $Coro::current->{desc} = "map prefetcher";
2125
1847 while (%MAP_PREFETCH) { 2126 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 2127 while (my ($k, $v) = each %MAP_PREFETCH) {
1849 my $map = find $path 2128 if (my $map = find $k) {
1850 or next;
1851 $map->load; 2129 $map->load if $v;
2130 }
1852 2131
1853 delete $MAP_PREFETCH{$path}; 2132 delete $MAP_PREFETCH{$k};
1854 } 2133 }
1855 } 2134 }
1856 undef $MAP_PREFETCHER; 2135 undef $MAP_PREFETCHER;
1857 }; 2136 };
1858 $MAP_PREFETCHER->prio (6); 2137 $MAP_PREFETCHER->prio (6);
1861} 2140}
1862 2141
1863sub save { 2142sub save {
1864 my ($self) = @_; 2143 my ($self) = @_;
1865 2144
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2145 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2146
1868 $self->{last_save} = $cf::RUNTIME; 2147 $self->{last_save} = $cf::RUNTIME;
1869 2148
1870 return unless $self->dirty; 2149 return unless $self->dirty;
1871 2150
1877 return if $self->{deny_save}; 2156 return if $self->{deny_save};
1878 2157
1879 local $self->{last_access} = $self->last_access;#d# 2158 local $self->{last_access} = $self->last_access;#d#
1880 2159
1881 cf::async { 2160 cf::async {
2161 $Coro::current->{desc} = "map player save";
1882 $_->contr->save for $self->players; 2162 $_->contr->save for $self->players;
1883 }; 2163 };
1884 2164
1885 if ($uniq) { 2165 if ($uniq) {
1886 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1894 my ($self) = @_; 2174 my ($self) = @_;
1895 2175
1896 # save first because save cedes 2176 # save first because save cedes
1897 $self->save; 2177 $self->save;
1898 2178
1899 my $lock = cf::lock_acquire "map_data:" . $self->path; 2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
1900 2180
1901 return if $self->players; 2181 return if $self->players;
1902 return if $self->in_memory != cf::MAP_IN_MEMORY; 2182 return if $self->in_memory != cf::MAP_IN_MEMORY;
1903 return if $self->{deny_save}; 2183 return if $self->{deny_save};
1904 2184
2185 $self->in_memory (cf::MAP_SWAPPED);
2186
2187 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP;
1905 $self->clear; 2189 $self->clear;
1906 $self->in_memory (cf::MAP_SWAPPED);
1907} 2190}
1908 2191
1909sub reset_at { 2192sub reset_at {
1910 my ($self) = @_; 2193 my ($self) = @_;
1911 2194
1943 if $uniq; 2226 if $uniq;
1944 } 2227 }
1945 2228
1946 delete $cf::MAP{$self->path}; 2229 delete $cf::MAP{$self->path};
1947 2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
1948 $self->clear; 2233 $self->clear;
1949
1950 $_->clear_links_to ($self) for values %cf::MAP;
1951 2234
1952 $self->unlink_save; 2235 $self->unlink_save;
1953 $self->destroy; 2236 $self->destroy;
1954} 2237}
1955 2238
1956my $nuke_counter = "aaaa"; 2239my $nuke_counter = "aaaa";
1957 2240
1958sub nuke { 2241sub nuke {
1959 my ($self) = @_; 2242 my ($self) = @_;
1960 2243
2244 {
2245 my $lock = cf::lock_acquire "map_data:$self->{path}";
2246
1961 delete $cf::MAP{$self->path}; 2247 delete $cf::MAP{$self->path};
1962 2248
1963 $self->unlink_save; 2249 $self->unlink_save;
1964 2250
1965 bless $self, "cf::map"; 2251 bless $self, "cf::map";
1966 delete $self->{deny_reset}; 2252 delete $self->{deny_reset};
1967 $self->{deny_save} = 1; 2253 $self->{deny_save} = 1;
1968 $self->reset_timeout (1); 2254 $self->reset_timeout (1);
1969 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970 2256
1971 $cf::MAP{$self->path} = $self; 2257 $cf::MAP{$self->path} = $self;
2258 }
1972 2259
1973 $self->reset; # polite request, might not happen 2260 $self->reset; # polite request, might not happen
1974} 2261}
1975 2262
1976=item $maps = cf::map::tmp_maps 2263=item $maps = cf::map::tmp_maps
2052 2339
2053sub inv_recursive { 2340sub inv_recursive {
2054 inv_recursive_ inv $_[0] 2341 inv_recursive_ inv $_[0]
2055} 2342}
2056 2343
2344=item $ref = $ob->ref
2345
2346creates and returns a persistent reference to an objetc that can be stored as a string.
2347
2348=item $ob = cf::object::deref ($refstring)
2349
2350returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2351even if the object actually exists. May block.
2352
2353=cut
2354
2355sub deref {
2356 my ($ref) = @_;
2357
2358 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2359 my ($uuid, $name) = ($1, $2);
2360 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2361 or return;
2362 $pl->ob->uuid eq $uuid
2363 or return;
2364
2365 $pl->ob
2366 } else {
2367 warn "$ref: cannot resolve object reference\n";
2368 undef
2369 }
2370}
2371
2057package cf; 2372package cf;
2058 2373
2059=back 2374=back
2060 2375
2061=head3 cf::object::player 2376=head3 cf::object::player
2083 2398
2084 } else { 2399 } else {
2085 my $pl = $self->contr; 2400 my $pl = $self->contr;
2086 2401
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2402 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog}; 2403 my $dialog = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply ( 2404 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090 $diag->{id},
2091 msgtype => "reply",
2092 msg => $diag->{pl}->expand_cfpod ($msg),
2093 add_topics => []
2094 );
2095 2405
2096 } else { 2406 } else {
2097 $msg = $npc->name . " says: $msg" if $npc; 2407 $msg = $npc->name . " says: $msg" if $npc;
2098 $self->message ($msg, $flags); 2408 $self->message ($msg, $flags);
2099 } 2409 }
2100 } 2410 }
2411}
2412
2413=item $object->send_msg ($channel, $msg, $color, [extra...])
2414
2415=cut
2416
2417sub cf::object::send_msg {
2418 my $pl = shift->contr
2419 or return;
2420 $pl->send_msg (@_);
2101} 2421}
2102 2422
2103=item $player_object->may ("access") 2423=item $player_object->may ("access")
2104 2424
2105Returns wether the given player is authorized to access resource "access" 2425Returns wether the given player is authorized to access resource "access"
2184 # use -1 or undef as default coordinates, not 0, 0 2504 # use -1 or undef as default coordinates, not 0, 0
2185 ($x, $y) = ($map->enter_x, $map->enter_y) 2505 ($x, $y) = ($map->enter_x, $map->enter_y)
2186 if $x <=0 && $y <= 0; 2506 if $x <=0 && $y <= 0;
2187 2507
2188 $map->load; 2508 $map->load;
2189 $map->load_diag; 2509 $map->load_neighbours;
2190 2510
2191 return unless $self->contr->active; 2511 return unless $self->contr->active;
2192 $self->activate_recursive; 2512 $self->activate_recursive;
2193 2513
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2514 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2515 $self->enter_map ($map, $x, $y);
2196} 2516}
2197 2517
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2518=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199 2519
2200Moves the player to the given map-path and coordinates by first freezing 2520Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback 2521her, loading and preparing them map, calling the provided $check callback
2202that has to return the map if sucecssful, and then unfreezes the player on 2522that has to return the map if sucecssful, and then unfreezes the player on
2203the new (success) or old (failed) map position. 2523the new (success) or old (failed) map position. In either case, $done will
2524be called at the end of this process.
2204 2525
2205=cut 2526=cut
2206 2527
2207our $GOTOGEN; 2528our $GOTOGEN;
2208 2529
2209sub cf::object::player::goto { 2530sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2531 my ($self, $path, $x, $y, $check, $done) = @_;
2211 2532
2212 # do generation counting so two concurrent goto's will be executed in-order 2533 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2534 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2535
2215 $self->enter_link; 2536 $self->enter_link;
2216 2537
2217 (async { 2538 (async {
2539 $Coro::current->{desc} = "player::goto $path $x $y";
2540
2541 # *tag paths override both path and x|y
2542 if ($path =~ /^\*(.*)$/) {
2543 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2544 my $ob = $obs[rand @obs];
2545
2546 # see if we actually can go there
2547 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2548 $ob = $obs[rand @obs];
2549 } else {
2550 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2551 }
2552 # else put us there anyways for now #d#
2553
2554 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2555 } else {
2556 ($path, $x, $y) = (undef, undef, undef);
2557 }
2558 }
2559
2218 my $map = eval { 2560 my $map = eval {
2219 my $map = cf::map::find $path; 2561 my $map = defined $path ? cf::map::find $path : undef;
2220 2562
2221 if ($map) { 2563 if ($map) {
2222 $map = $map->customise_for ($self); 2564 $map = $map->customise_for ($self);
2223 $map = $check->($map) if $check && $map; 2565 $map = $check->($map) if $check && $map;
2224 } else { 2566 } else {
2225 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2567 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2226 } 2568 }
2227 2569
2228 $map 2570 $map
2229 }; 2571 };
2230 2572
2235 2577
2236 if ($gen == $self->{_goto_generation}) { 2578 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2579 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2580 $self->leave_link ($map, $x, $y);
2239 } 2581 }
2582
2583 $done->() if $done;
2240 })->prio (1); 2584 })->prio (1);
2241} 2585}
2242 2586
2243=item $player_object->enter_exit ($exit_object) 2587=item $player_object->enter_exit ($exit_object)
2244 2588
2313 my $hp = $exit->stats->hp; 2657 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp; 2658 my $sp = $exit->stats->sp;
2315 2659
2316 $self->enter_link; 2660 $self->enter_link;
2317 2661
2662 # if exit is damned, update players death & WoR home-position
2663 $self->contr->savebed ($slaying, $hp, $sp)
2664 if $exit->flag (FLAG_DAMNED);
2665
2318 (async { 2666 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2668
2319 $self->deactivate_recursive; # just to be sure 2669 $self->deactivate_recursive; # just to be sure
2320 unless (eval { 2670 unless (eval {
2321 $self->goto ($slaying, $hp, $sp); 2671 $self->goto ($slaying, $hp, $sp);
2322 2672
2323 1; 2673 1;
2349 2699
2350 utf8::encode $text; 2700 utf8::encode $text;
2351 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2701 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352} 2702}
2353 2703
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 2704=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 2705
2356Send a drawinfo or msg packet to the client, formatting the msg for the 2706Send a drawinfo or msg packet to the client, formatting the msg for the
2357client if neccessary. C<$type> should be a string identifying the type of 2707client if neccessary. C<$type> should be a string identifying the type of
2358the message, with C<log> being the default. If C<$color> is negative, suppress 2708the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet. 2709the message unless the client supports the msg packet.
2360 2710
2361=cut 2711=cut
2362 2712
2713# non-persistent channels (usually the info channel)
2714our %CHANNEL = (
2715 "c/identify" => {
2716 id => "infobox",
2717 title => "Identify",
2718 reply => undef,
2719 tooltip => "Items recently identified",
2720 },
2721 "c/examine" => {
2722 id => "infobox",
2723 title => "Examine",
2724 reply => undef,
2725 tooltip => "Signs and other items you examined",
2726 },
2727 "c/book" => {
2728 id => "infobox",
2729 title => "Book",
2730 reply => undef,
2731 tooltip => "The contents of a note or book",
2732 },
2733 "c/lookat" => {
2734 id => "infobox",
2735 title => "Look",
2736 reply => undef,
2737 tooltip => "What you saw there",
2738 },
2739 "c/who" => {
2740 id => "infobox",
2741 title => "Players",
2742 reply => undef,
2743 tooltip => "Shows players who are currently online",
2744 },
2745 "c/body" => {
2746 id => "infobox",
2747 title => "Body Parts",
2748 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available",
2750 },
2751 "c/uptime" => {
2752 id => "infobox",
2753 title => "Uptime",
2754 reply => undef,
2755 tooltip => "How long the server has been running since last restart",
2756 },
2757 "c/mapinfo" => {
2758 id => "infobox",
2759 title => "Map Info",
2760 reply => undef,
2761 tooltip => "Information related to the maps",
2762 },
2763);
2764
2363sub cf::client::send_msg { 2765sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2766 my ($self, $channel, $msg, $color, @extra) = @_;
2365 2767
2366 $msg = $self->pl->expand_cfpod ($msg); 2768 $msg = $self->pl->expand_cfpod ($msg);
2367 2769
2770 $color &= cf::NDI_CLIENT_MASK; # just in case...
2771
2772 # check predefined channels, for the benefit of C
2773 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel};
2775
2776 $self->ext_msg (channel_info => $channel)
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id};
2780
2781 } elsif (ref $channel) {
2782 # send meta info to client, if not yet sent
2783 unless (exists $self->{channel}{$channel->{id}}) {
2784 $self->{channel}{$channel->{id}} = $channel;
2785 $self->ext_msg (channel_info => $channel)
2786 if $self->can_msg;
2787 }
2788
2789 $channel = $channel->{id};
2790 }
2791
2792 return unless @extra || length $msg;
2793
2368 if ($self->can_msg) { 2794 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2795 # default colour, mask it out
2796 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2797 if $color & cf::NDI_DEF;
2798
2799 $self->send_packet ("msg " . $self->{json_coder}->encode (
2800 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2370 } else { 2801 } else {
2371 # replace some tags by gcfclient-compatible ones
2372 for ($msg) {
2373 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/;
2379 }
2380
2381 if ($color >= 0) { 2802 if ($color >= 0) {
2803 # replace some tags by gcfclient-compatible ones
2804 for ($msg) {
2805 1 while
2806 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2807 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2808 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2809 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2810 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2811 }
2812
2813 $color &= cf::NDI_COLOR_MASK;
2814
2815 utf8::encode $msg;
2816
2382 if (0 && $msg =~ /\[/) { 2817 if (0 && $msg =~ /\[/) {
2818 # COMMAND/INFO
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2819 $self->send_packet ("drawextinfo $color 10 8 $msg")
2384 } else { 2820 } else {
2385 s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2821 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2386 $self->send_packet ("drawinfo $color $msg") 2822 $self->send_packet ("drawinfo $color $msg")
2387 } 2823 }
2388 } 2824 }
2389 } 2825 }
2390} 2826}
2391 2827
2392=item $client->ext_event ($type, %msg) 2828=item $client->ext_msg ($type, @msg)
2393 2829
2394Sends an exti event to the client. 2830Sends an ext event to the client.
2395 2831
2396=cut 2832=cut
2397 2833
2398sub cf::client::ext_event($$%) { 2834sub cf::client::ext_msg($$@) {
2399 my ($self, $type, %msg) = @_; 2835 my ($self, $type, @msg) = @_;
2400 2836
2837 if ($self->extcmd == 2) {
2838 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2839 } elsif ($self->extcmd == 1) { # TODO: remove
2401 $msg{msgtype} = "event_$type"; 2840 push @msg, msgtype => "event_$type";
2402 $self->send_packet ("ext " . cf::to_json \%msg); 2841 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2842 }
2843}
2844
2845=item $client->ext_reply ($msgid, @msg)
2846
2847Sends an ext reply to the client.
2848
2849=cut
2850
2851sub cf::client::ext_reply($$@) {
2852 my ($self, $id, @msg) = @_;
2853
2854 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2856 } elsif ($self->extcmd == 1) {
2857 #TODO: version 1, remove
2858 unshift @msg, msgtype => "reply", msgid => $id;
2859 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2860 }
2403} 2861}
2404 2862
2405=item $success = $client->query ($flags, "text", \&cb) 2863=item $success = $client->query ($flags, "text", \&cb)
2406 2864
2407Queues a query to the client, calling the given callback with 2865Queues a query to the client, calling the given callback with
2408the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2866the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2409C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2867C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2410 2868
2411Queries can fail, so check the return code. Or don't, as queries will become 2869Queries can fail, so check the return code. Or don't, as queries will
2412reliable at some point in the future. 2870become reliable at some point in the future.
2413 2871
2414=cut 2872=cut
2415 2873
2416sub cf::client::query { 2874sub cf::client::query {
2417 my ($self, $flags, $text, $cb) = @_; 2875 my ($self, $flags, $text, $cb) = @_;
2425 utf8::encode $text; 2883 utf8::encode $text;
2426 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2884 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427 2885
2428 $self->send_packet ($self->{query_queue}[0][0]) 2886 $self->send_packet ($self->{query_queue}[0][0])
2429 if @{ $self->{query_queue} } == 1; 2887 if @{ $self->{query_queue} } == 1;
2888
2889 1
2430} 2890}
2431 2891
2432cf::client->attach ( 2892cf::client->attach (
2893 on_connect => sub {
2894 my ($ns) = @_;
2895
2896 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2897 },
2433 on_reply => sub { 2898 on_reply => sub {
2434 my ($ns, $msg) = @_; 2899 my ($ns, $msg) = @_;
2435 2900
2436 # this weird shuffling is so that direct followup queries 2901 # this weird shuffling is so that direct followup queries
2437 # get handled first 2902 # get handled first
2449 } else { 2914 } else {
2450 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2915 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451 } 2916 }
2452 } 2917 }
2453 }, 2918 },
2919 on_exticmd => sub {
2920 my ($ns, $buf) = @_;
2921
2922 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2923
2924 if (ref $msg) {
2925 my ($type, $reply, @payload) =
2926 "ARRAY" eq ref $msg
2927 ? @$msg
2928 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2929
2930 my @reply;
2931
2932 if (my $cb = $EXTICMD{$type}) {
2933 @reply = $cb->($ns, @payload);
2934 }
2935
2936 $ns->ext_reply ($reply, @reply)
2937 if $reply;
2938
2939 } else {
2940 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2941 }
2942
2943 cf::override;
2944 },
2454); 2945);
2455 2946
2456=item $client->async (\&cb) 2947=item $client->async (\&cb)
2457 2948
2458Create a new coroutine, running the specified callback. The coroutine will 2949Create a new coroutine, running the specified callback. The coroutine will
2499our $safe = new Safe "safe"; 2990our $safe = new Safe "safe";
2500our $safe_hole = new Safe::Hole; 2991our $safe_hole = new Safe::Hole;
2501 2992
2502$SIG{FPE} = 'IGNORE'; 2993$SIG{FPE} = 'IGNORE';
2503 2994
2504$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2995$safe->permit_only (Opcode::opset qw(
2996 :base_core :base_mem :base_orig :base_math
2997 grepstart grepwhile mapstart mapwhile
2998 sort time
2999));
2505 3000
2506# here we export the classes and methods available to script code 3001# here we export the classes and methods available to script code
2507 3002
2508=pod 3003=pod
2509 3004
2510The following functions and methods are available within a safe environment: 3005The following functions and methods are available within a safe environment:
2511 3006
2512 cf::object contr pay_amount pay_player map 3007 cf::object
3008 contr pay_amount pay_player map x y force_find force_add destroy
3009 insert remove name archname title slaying race decrease_ob_nr
3010
2513 cf::object::player player 3011 cf::object::player
2514 cf::player peaceful 3012 player
2515 cf::map trigger 3013
3014 cf::player
3015 peaceful
3016
3017 cf::map
3018 trigger
2516 3019
2517=cut 3020=cut
2518 3021
2519for ( 3022for (
2520 ["cf::object" => qw(contr pay_amount pay_player map)], 3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3024 insert remove inv name archname title slaying race
3025 decrease_ob_nr destroy)],
2521 ["cf::object::player" => qw(player)], 3026 ["cf::object::player" => qw(player)],
2522 ["cf::player" => qw(peaceful)], 3027 ["cf::player" => qw(peaceful)],
2523 ["cf::map" => qw(trigger)], 3028 ["cf::map" => qw(trigger)],
2524) { 3029) {
2525 no strict 'refs'; 3030 no strict 'refs';
2601# the server's init and main functions 3106# the server's init and main functions
2602 3107
2603sub load_facedata($) { 3108sub load_facedata($) {
2604 my ($path) = @_; 3109 my ($path) = @_;
2605 3110
3111 # HACK to clear player env face cache, we need some signal framework
3112 # for this (global event?)
3113 %ext::player_env::MUSIC_FACE_CACHE = ();
3114
3115 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3116
2606 warn "loading facedata from $path\n"; 3117 warn "loading facedata from $path\n";
2607 3118
2608 my $facedata; 3119 my $facedata;
2609 0 < aio_load $path, $facedata 3120 0 < aio_load $path, $facedata
2610 or die "$path: $!"; 3121 or die "$path: $!";
2612 $facedata = Coro::Storable::thaw $facedata; 3123 $facedata = Coro::Storable::thaw $facedata;
2613 3124
2614 $facedata->{version} == 2 3125 $facedata->{version} == 2
2615 or cf::cleanup "$path: version mismatch, cannot proceed."; 3126 or cf::cleanup "$path: version mismatch, cannot proceed.";
2616 3127
3128 # patch in the exptable
3129 $facedata->{resource}{"res/exp_table"} = {
3130 type => FT_RSRC,
3131 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3132 };
3133 cf::cede_to_tick;
3134
2617 { 3135 {
2618 my $faces = $facedata->{faceinfo}; 3136 my $faces = $facedata->{faceinfo};
2619 3137
2620 while (my ($face, $info) = each %$faces) { 3138 while (my ($face, $info) = each %$faces) {
2621 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3139 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2622 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3140 cf::face::set_visibility $idx, $info->{visibility};
3141 cf::face::set_magicmap $idx, $info->{magicmap};
2623 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2624 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3143 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2625 Coro::cede; 3144
3145 cf::cede_to_tick;
2626 } 3146 }
2627 3147
2628 while (my ($face, $info) = each %$faces) { 3148 while (my ($face, $info) = each %$faces) {
2629 next unless $info->{smooth}; 3149 next unless $info->{smooth};
2630 my $idx = cf::face::find $face 3150 my $idx = cf::face::find $face
2631 or next; 3151 or next;
2632 if (my $smooth = cf::face::find $info->{smooth}) { 3152 if (my $smooth = cf::face::find $info->{smooth}) {
3153 cf::face::set_smooth $idx, $smooth;
2633 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3154 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634 } else { 3155 } else {
2635 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3156 warn "smooth face '$info->{smooth}' not found for face '$face'";
2636 } 3157 }
2637 Coro::cede; 3158
3159 cf::cede_to_tick;
2638 } 3160 }
2639 } 3161 }
2640 3162
2641 { 3163 {
2642 my $anims = $facedata->{animinfo}; 3164 my $anims = $facedata->{animinfo};
2643 3165
2644 while (my ($anim, $info) = each %$anims) { 3166 while (my ($anim, $info) = each %$anims) {
2645 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3167 cf::anim::set $anim, $info->{frames}, $info->{facings};
2646 Coro::cede; 3168 cf::cede_to_tick;
2647 } 3169 }
2648 3170
2649 cf::anim::invalidate_all; # d'oh 3171 cf::anim::invalidate_all; # d'oh
2650 } 3172 }
2651 3173
3174 {
3175 # TODO: for gcfclient pleasure, we should give resources
3176 # that gcfclient doesn't grok a >10000 face index.
3177 my $res = $facedata->{resource};
3178
3179 my $soundconf = delete $res->{"res/sound.conf"};
3180
3181 while (my ($name, $info) = each %$res) {
3182 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data;
3184
3185 if ($info->{type} & 1) {
3186 # prepend meta info
3187
3188 my $meta = $enc->encode ({
3189 name => $name,
3190 %{ $info->{meta} || {} },
3191 });
3192
3193 $data = pack "(w/a*)*", $meta, $info->{data};
3194 } else {
3195 $data = $info->{data};
3196 }
3197
3198 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3199 cf::face::set_type $idx, $info->{type};
3200
3201 cf::cede_to_tick;
3202 }
3203
3204 if ($soundconf) {
3205 $soundconf = $enc->decode (delete $soundconf->{data});
3206
3207 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3208 my $sound = $soundconf->{compat}[$_]
3209 or next;
3210
3211 my $face = cf::face::find "sound/$sound->[1]";
3212 cf::sound::set $sound->[0] => $face;
3213 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3214 }
3215
3216 while (my ($k, $v) = each %{$soundconf->{event}}) {
3217 my $face = cf::face::find "sound/$v";
3218 cf::sound::set $k => $face;
3219 }
3220 }
3221 }
3222
2652 1 3223 1
2653} 3224}
2654 3225
3226register_exticmd fx_want => sub {
3227 my ($ns, $want) = @_;
3228
3229 while (my ($k, $v) = each %$want) {
3230 $ns->fx_want ($k, $v);
3231 }
3232};
3233
2655sub reload_regions { 3234sub reload_regions {
3235 # HACK to clear player env face cache, we need some signal framework
3236 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = ();
3238
2656 load_resource_file "$MAPDIR/regions" 3239 load_resource_file "$MAPDIR/regions"
2657 or die "unable to load regions file\n"; 3240 or die "unable to load regions file\n";
3241
3242 for (cf::region::list) {
3243 $_->{match} = qr/$_->{match}/
3244 if exists $_->{match};
3245 }
2658} 3246}
2659 3247
2660sub reload_facedata { 3248sub reload_facedata {
2661 load_facedata "$DATADIR/facedata" 3249 load_facedata "$DATADIR/facedata"
2662 or die "unable to load facedata\n"; 3250 or die "unable to load facedata\n";
2663} 3251}
2664 3252
2665sub reload_archetypes { 3253sub reload_archetypes {
3254 load_resource_file "$DATADIR/archetypes"
3255 or die "unable to load archetypes\n";
3256 #d# NEED to laod twice to resolve forward references
3257 # this really needs to be done in an extra post-pass
3258 # (which needs to be synchronous, so solve it differently)
2666 load_resource_file "$DATADIR/archetypes" 3259 load_resource_file "$DATADIR/archetypes"
2667 or die "unable to load archetypes\n"; 3260 or die "unable to load archetypes\n";
2668} 3261}
2669 3262
2670sub reload_treasures { 3263sub reload_treasures {
2686 3279
2687sub init { 3280sub init {
2688 reload_resources; 3281 reload_resources;
2689} 3282}
2690 3283
2691sub cfg_load { 3284sub reload_config {
2692 open my $fh, "<:utf8", "$CONFDIR/config" 3285 open my $fh, "<:utf8", "$CONFDIR/config"
2693 or return; 3286 or return;
2694 3287
2695 local $/; 3288 local $/;
2696 *CFG = YAML::Syck::Load <$fh>; 3289 *CFG = YAML::Syck::Load <$fh>;
2712sub main { 3305sub main {
2713 # we must not ever block the main coroutine 3306 # we must not ever block the main coroutine
2714 local $Coro::idle = sub { 3307 local $Coro::idle = sub {
2715 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2716 (async { 3309 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER";
2717 Event::one_event; 3311 Event::one_event;
2718 })->prio (Coro::PRIO_MAX); 3312 })->prio (Coro::PRIO_MAX);
2719 }; 3313 };
2720 3314
2721 cfg_load; 3315 reload_config;
2722 db_init; 3316 db_init;
2723 load_extensions; 3317 load_extensions;
2724 3318
2725 $TICK_WATCHER->start; 3319 $TICK_WATCHER->start;
2726 Event::loop; 3320 Event::loop;
2793 # and maps saved/destroyed asynchronously. 3387 # and maps saved/destroyed asynchronously.
2794 warn "begin emergency player save\n"; 3388 warn "begin emergency player save\n";
2795 for my $login (keys %cf::PLAYER) { 3389 for my $login (keys %cf::PLAYER) {
2796 my $pl = $cf::PLAYER{$login} or next; 3390 my $pl = $cf::PLAYER{$login} or next;
2797 $pl->valid or next; 3391 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2798 $pl->save; 3393 $pl->save;
2799 } 3394 }
2800 warn "end emergency player save\n"; 3395 warn "end emergency player save\n";
2801 3396
2802 warn "begin emergency map save\n"; 3397 warn "begin emergency map save\n";
2850 3445
2851 warn "flushing outstanding aio requests"; 3446 warn "flushing outstanding aio requests";
2852 for (;;) { 3447 for (;;) {
2853 BDB::flush; 3448 BDB::flush;
2854 IO::AIO::flush; 3449 IO::AIO::flush;
2855 Coro::cede; 3450 Coro::cede_notself;
2856 last unless IO::AIO::nreqs || BDB::nreqs; 3451 last unless IO::AIO::nreqs || BDB::nreqs;
2857 warn "iterate..."; 3452 warn "iterate...";
2858 } 3453 }
2859 3454
2860 ++$RELOAD; 3455 ++$RELOAD;
2864 %EXT_CORO = (); 3459 %EXT_CORO = ();
2865 3460
2866 warn "removing commands"; 3461 warn "removing commands";
2867 %COMMAND = (); 3462 %COMMAND = ();
2868 3463
2869 warn "removing ext commands"; 3464 warn "removing ext/exti commands";
2870 %EXTCMD = (); 3465 %EXTCMD = ();
3466 %EXTICMD = ();
2871 3467
2872 warn "unloading/nuking all extensions"; 3468 warn "unloading/nuking all extensions";
2873 for my $pkg (@EXTS) { 3469 for my $pkg (@EXTS) {
2874 warn "... unloading $pkg"; 3470 warn "... unloading $pkg";
2875 3471
2918 warn "reloading cf.pm"; 3514 warn "reloading cf.pm";
2919 require cf; 3515 require cf;
2920 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3516 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2921 3517
2922 warn "loading config and database again"; 3518 warn "loading config and database again";
2923 cf::cfg_load; 3519 cf::reload_config;
2924 3520
2925 warn "loading extensions"; 3521 warn "loading extensions";
2926 cf::load_extensions; 3522 cf::load_extensions;
2927 3523
2928 warn "reattaching attachments to objects/players"; 3524 warn "reattaching attachments to objects/players";
2964register_command "reload" => sub { 3560register_command "reload" => sub {
2965 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
2966 3562
2967 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
2968 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
2969 async { reload_perl }; 3567 reload_perl;
3568 };
2970 } 3569 }
2971}; 3570};
2972 3571
2973unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
2974 3573
2993 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
2994 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
2995 $signal->wait; 3594 $signal->wait;
2996} 3595}
2997 3596
2998 my $min = 1e6;#d#
2999 my $avg = 10;
3000$TICK_WATCHER = Event->timer ( 3597$TICK_WATCHER = Event->timer (
3001 reentrant => 0, 3598 reentrant => 0,
3002 parked => 1, 3599 parked => 1,
3003 prio => 0, 3600 prio => 0,
3004 at => $NEXT_TICK || $TICK, 3601 at => $NEXT_TICK || $TICK,
3012 3609
3013 $NOW = $tick_start = Event::time; 3610 $NOW = $tick_start = Event::time;
3014 3611
3015 cf::server_tick; # one server iteration 3612 cf::server_tick; # one server iteration
3016 3613
3017 0 && sync_job {#d#
3018 for(1..10) {
3019 my $t = Event::time;
3020 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3021 or die;
3022
3023 $map->width (50);
3024 $map->height (50);
3025 $map->alloc;
3026 $map->_load_objects ("/tmp/x.map", 1);
3027 my $t = Event::time - $t;
3028
3029 #next unless $t < 0.0013;#d#
3030 if ($t < $min) {
3031 $min = $t;
3032 }
3033 $avg = $avg * 0.99 + $t * 0.01;
3034 }
3035 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3036 exit 0;
3037 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3038 };
3039
3040 $RUNTIME += $TICK; 3614 $RUNTIME += $TICK;
3041 $NEXT_TICK += $TICK; 3615 $NEXT_TICK += $TICK;
3042 3616
3043 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3617 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3044 $NEXT_RUNTIME_WRITE = $NOW + 10; 3618 $NEXT_RUNTIME_WRITE = $NOW + 10;
3045 Coro::async_pool { 3619 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver";
3046 write_runtime 3621 write_runtime
3047 or warn "ERROR: unable to write runtime file: $!"; 3622 or warn "ERROR: unable to write runtime file: $!";
3048 }; 3623 };
3049 } 3624 }
3050 3625
3051# my $AFTER = Event::time;
3052# warn $AFTER - $NOW;#d#
3053
3054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3055 $sig->send; 3627 $sig->send;
3056 } 3628 }
3057 while (my $sig = shift @WAIT_FOR_TICK) { 3629 while (my $sig = shift @WAIT_FOR_TICK) {
3058 $sig->send; 3630 $sig->send;
3068 3640
3069 $LOAD = ($NOW - $tick_start) / $TICK; 3641 $LOAD = ($NOW - $tick_start) / $TICK;
3070 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3071 3643
3072 _post_tick; 3644 _post_tick;
3073
3074
3075 }, 3645 },
3076); 3646);
3077 3647
3078{ 3648{
3649 BDB::min_parallel 8;
3079 BDB::max_poll_time $TICK * 0.1; 3650 BDB::max_poll_time $TICK * 0.1;
3080 $BDB_POLL_WATCHER = Event->io ( 3651 $BDB_POLL_WATCHER = Event->io (
3081 reentrant => 0, 3652 reentrant => 0,
3082 fd => BDB::poll_fileno, 3653 fd => BDB::poll_fileno,
3083 poll => 'r', 3654 poll => 'r',
3084 prio => 0, 3655 prio => 0,
3085 data => WF_AUTOCANCEL, 3656 data => WF_AUTOCANCEL,
3086 cb => \&BDB::poll_cb, 3657 cb => \&BDB::poll_cb,
3087 ); 3658 );
3088 BDB::min_parallel 8;
3089 3659
3090 BDB::set_sync_prepare { 3660 BDB::set_sync_prepare {
3091 my $status; 3661 my $status;
3092 my $current = $Coro::current; 3662 my $current = $Coro::current;
3093 ( 3663 (
3102 ) 3672 )
3103 }; 3673 };
3104 3674
3105 unless ($DB_ENV) { 3675 unless ($DB_ENV) {
3106 $DB_ENV = BDB::db_env_create; 3676 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3678 | BDB::LOG_AUTOREMOVE, 1);
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3107 3681
3108 cf::sync_job { 3682 cf::sync_job {
3109 eval { 3683 eval {
3110 BDB::db_env_open 3684 BDB::db_env_open
3111 $DB_ENV, 3685 $DB_ENV,
3113 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3687 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3114 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3688 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3115 0666; 3689 0666;
3116 3690
3117 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3691 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3118
3119 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3120 $DB_ENV->set_lk_detect;
3121 }; 3692 };
3122 3693
3123 cf::cleanup "db_env_open(db): $@" if $@; 3694 cf::cleanup "db_env_open(db): $@" if $@;
3124 }; 3695 };
3125 } 3696 }
3697
3698 $BDB_DEADLOCK_WATCHER = Event->timer (
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 );
3708 $BDB_CHECKPOINT_WATCHER = Event->timer (
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 );
3718 $BDB_TRICKLE_WATCHER = Event->timer (
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 );
3126} 3728}
3127 3729
3128{ 3730{
3129 IO::AIO::min_parallel 8; 3731 IO::AIO::min_parallel 8;
3130 3732
3133 $AIO_POLL_WATCHER = Event->io ( 3735 $AIO_POLL_WATCHER = Event->io (
3134 reentrant => 0, 3736 reentrant => 0,
3135 data => WF_AUTOCANCEL, 3737 data => WF_AUTOCANCEL,
3136 fd => IO::AIO::poll_fileno, 3738 fd => IO::AIO::poll_fileno,
3137 poll => 'r', 3739 poll => 'r',
3138 prio => 6, 3740 prio => 0,
3139 cb => \&IO::AIO::poll_cb, 3741 cb => \&IO::AIO::poll_cb,
3140 ); 3742 );
3141} 3743}
3142 3744
3143my $_log_backtrace; 3745my $_log_backtrace;
3149 3751
3150 # limit the # of concurrent backtraces 3752 # limit the # of concurrent backtraces
3151 if ($_log_backtrace < 2) { 3753 if ($_log_backtrace < 2) {
3152 ++$_log_backtrace; 3754 ++$_log_backtrace;
3153 async { 3755 async {
3756 $Coro::current->{desc} = "abt $msg";
3757
3154 my @bt = fork_call { 3758 my @bt = fork_call {
3155 @addr = map { sprintf "%x", $_ } @addr; 3759 @addr = map { sprintf "%x", $_ } @addr;
3156 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3760 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3157 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3761 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3158 or die "addr2line: $!"; 3762 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines