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.323 by root, Sat Jul 28 12:02:58 2007 UTC vs.
Revision 1.411 by root, Fri Feb 1 15:54:07 2008 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV 1.86;
10use 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.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
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::BDB;
23use Coro::Storable; 24use Coro::Storable;
25use Coro::Util ();
24 26
25use JSON::XS 1.4 (); 27use JSON::XS 2.01 ();
26use BDB (); 28use BDB ();
27use Data::Dumper; 29use Data::Dumper;
28use Digest::MD5; 30use Digest::MD5;
29use Fcntl; 31use Fcntl;
30use YAML::Syck (); 32use YAML ();
31use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
32use Time::HiRes; 34use Time::HiRes;
33use Compress::LZF; 35use Compress::LZF;
34use Digest::MD5 (); 36use Digest::MD5 ();
35 37
36# configure various modules to our taste 38# configure various modules to our taste
37# 39#
38$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 43
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 45
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 47
… …
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 66our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 69our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
74 72
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER; 74our $TICK_WATCHER;
77our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 77our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
82 79
83our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 84our $DB_ENV;
85 85
86our %CFG; 86our %CFG;
87 87
88our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 89our $RUNTIME;
90our $NOW;
90 91
91our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
94 95
95# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 98
… …
158 159
159The raw value load value from the last tick. 160The raw value load value from the last tick.
160 161
161=item %cf::CFG 162=item %cf::CFG
162 163
163Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 165from wherever your confdir points to.
165 166
166=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
167 168
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
186 $msg .= "\n" 187 $msg .= "\n"
187 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
188 189
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 191
191 utf8::encode $msg;
192 LOG llevError, $msg; 192 LOG llevError, $msg;
193 }; 193 };
194} 194}
195
196$Coro::State::DIEHOOK = sub {
197 return unless $^S eq 0; # "eq", not "=="
198
199 if ($Coro::current == $Coro::main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d#
202 }#d#
203
204 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate
207};
208
209$SIG{__DIE__} = sub { }; #d#?
195 210
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
212)) { 227)) {
213 no strict 'refs'; 228 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 230}
216 231
217$Event::DIED = sub { 232$EV::DIED = sub {
218 warn "error in event callback: @_"; 233 warn "error in event callback: @_";
219}; 234};
220 235
221############################################################################# 236#############################################################################
222 237
… …
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 260 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 261 $d
247 } || "[unable to dump $_[0]: '$@']"; 262 } || "[unable to dump $_[0]: '$@']";
248} 263}
249 264
250=item $ref = cf::from_json $json 265=item $ref = cf::decode_json $json
251 266
252Converts a JSON string into the corresponding perl data structure. 267Converts a JSON string into the corresponding perl data structure.
253 268
254=item $json = cf::to_json $ref 269=item $json = cf::encode_json $ref
255 270
256Converts a perl data structure into its JSON representation. 271Converts a perl data structure into its JSON representation.
257 272
258=cut 273=cut
259 274
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 276
262sub to_json ($) { $json_coder->encode ($_[0]) } 277sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 278sub decode_json($) { $json_coder->decode ($_[0]) }
264 279
265=item cf::lock_wait $string 280=item cf::lock_wait $string
266 281
267Wait until the given lock is available. See cf::lock_acquire. 282Wait until the given lock is available. See cf::lock_acquire.
268 283
… …
271Wait until the given lock is available and then acquires it and returns 286Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 287a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 288for example when the coroutine gets canceled), the lock is automatically
274returned. 289returned.
275 290
291Locks are *not* recursive, locking from the same coro twice results in a
292deadlocked coro.
293
276Lock names should begin with a unique identifier (for example, cf::map::find 294Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 295uses map_find and cf::map::load uses map_load).
278 296
279=item $locked = cf::lock_active $string 297=item $locked = cf::lock_active $string
280 298
281Return true if the lock is currently active, i.e. somebody has locked it. 299Return true if the lock is currently active, i.e. somebody has locked it.
282 300
283=cut 301=cut
284 302
285our %LOCK; 303our %LOCK;
304our %LOCKER;#d#
286 305
287sub lock_wait($) { 306sub lock_wait($) {
288 my ($key) = @_; 307 my ($key) = @_;
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
289 313
290 # wait for lock, if any 314 # wait for lock, if any
291 while ($LOCK{$key}) { 315 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 316 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 317 Coro::schedule;
… …
299 323
300 # wait, to be sure we are not locked 324 # wait, to be sure we are not locked
301 lock_wait $key; 325 lock_wait $key;
302 326
303 $LOCK{$key} = []; 327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
304 329
305 Coro::guard { 330 Coro::guard {
331 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 332 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 333 $_->ready for @{ delete $LOCK{$key} };
308 } 334 }
309} 335}
310 336
… …
322 }; 348 };
323 $TICK_WATCHER->stop; 349 $TICK_WATCHER->stop;
324 $guard 350 $guard
325} 351}
326 352
353=item cf::periodic $interval, $cb
354
355Like EV::periodic, but randomly selects a starting point so that the actions
356get spread over timer.
357
358=cut
359
360sub periodic($$) {
361 my ($interval, $cb) = @_;
362
363 my $start = rand List::Util::min 180, $interval;
364
365 EV::periodic $start, $interval, 0, $cb
366}
367
327=item cf::get_slot $time[, $priority[, $name]] 368=item cf::get_slot $time[, $priority[, $name]]
328 369
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 370Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 371This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 372of cpu time till the next tick. The slot is only valid till the next cede.
… …
340our @SLOT_QUEUE; 381our @SLOT_QUEUE;
341our $SLOT_QUEUE; 382our $SLOT_QUEUE;
342 383
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 384$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 385$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager");
387
345 my $signal = new Coro::Signal; 388 my $signal = new Coro::Signal;
346 389
347 while () { 390 while () {
348 next_job: 391 next_job:
349 my $avail = cf::till_tick; 392 my $avail = cf::till_tick;
… …
357 } 400 }
358 } 401 }
359 } 402 }
360 403
361 if (@SLOT_QUEUE) { 404 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 405 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 406 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 407 $signal->wait;
365 } else { 408 } else {
366 Coro::schedule; 409 Coro::schedule;
367 } 410 }
… …
390 433
391BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
392 435
393=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
394 437
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 438The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 439is always able to handle events or runnable, as Deliantra is only
397partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 440partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 441acceptable.
399 442
400If it must be done, put the blocking parts into C<sync_job>. This will run 443If it must be done, put the blocking parts into C<sync_job>. This will run
401the given BLOCK in another coroutine while waiting for the result. The 444the given BLOCK in another coroutine while waiting for the result. The
… …
406 449
407sub sync_job(&) { 450sub sync_job(&) {
408 my ($job) = @_; 451 my ($job) = @_;
409 452
410 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 454 my $time = EV::time;
412 455
413 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
415 458
459 LOG llevError, Carp::longmess "sync job";#d#
460
416 # TODO: use suspend/resume instead 461 # TODO: use suspend/resume instead
417 # (but this is cancel-safe) 462 # (but this is cancel-safe)
418 my $freeze_guard = freeze_mainloop; 463 my $freeze_guard = freeze_mainloop;
419 464
420 my $busy = 1; 465 my $busy = 1;
421 my @res; 466 my @res;
422 467
423 (async { 468 (async {
469 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 470 @res = eval { $job->() };
425 warn $@ if $@; 471 warn $@ if $@;
426 undef $busy; 472 undef $busy;
427 })->prio (Coro::PRIO_MAX); 473 })->prio (Coro::PRIO_MAX);
428 474
429 while ($busy) { 475 while ($busy) {
430 Coro::cede or Event::one_event; 476 if (Coro::nready) {
477 Coro::cede_notself;
478 } else {
479 EV::loop EV::LOOP_ONESHOT;
431 } 480 }
481 }
432 482
433 $time = Event::time - $time; 483 $time = EV::time - $time;
434 484
435 LOG llevError | logBacktrace, Carp::longmess "long sync job" 485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437 487
438 $tick_start += $time; # do not account sync jobs to server load 488 $tick_start += $time; # do not account sync jobs to server load
… …
468=item fork_call { }, $args 518=item fork_call { }, $args
469 519
470Executes the given code block with the given arguments in a seperate 520Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 521process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 522Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 523never block itself or use any form of event handling.
474 524
475=cut 525=cut
476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485 526
486sub fork_call(&@) { 527sub fork_call(&@) {
487 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
488 529
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 530 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 531 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 532 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 533
494 if (my $pid = fork) { 534 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 535 reset_signals;
508 local $SIG{__WARN__}; 536 &$cb
509 local $SIG{__DIE__}; 537 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 538
516 eval { 539 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 540}
529 541
530=item $value = cf::db_get $family => $key 542=item $value = cf::db_get $family => $key
531 543
532Returns a single value from the environment database. 544Returns a single value from the environment database.
… …
534=item cf::db_put $family => $key => $value 546=item cf::db_put $family => $key => $value
535 547
536Stores the given C<$value> in the family. It can currently store binary 548Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 549data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 550
551=item $db = cf::db_table "name"
552
553Create and/or open a new database table. The string must not be "db" and must be unique
554within each server.
555
539=cut 556=cut
557
558sub db_table($) {
559 my ($name) = @_;
560 my $db = BDB::db_create $DB_ENV;
561
562 eval {
563 $db->set_flags (BDB::CHKSUM);
564
565 utf8::encode $name;
566 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
567 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
568 cf::cleanup "db_open(db): $!" if $!;
569 };
570 cf::cleanup "db_open(db): $@" if $@;
571
572 $db
573}
540 574
541our $DB; 575our $DB;
542 576
543sub db_init { 577sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 578 cf::sync_job {
548 eval { 579 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 580 };
558} 581}
559 582
560sub db_get($$) { 583sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 584 my $key = "$_[0]/$_[1]";
562 585
… …
612 if (1) { 635 if (1) {
613 $md5 = 636 $md5 =
614 join "\x00", 637 join "\x00",
615 $processversion, 638 $processversion,
616 map { 639 map {
617 Coro::cede; 640 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 641 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 642 } 0.. $#$src;
620 643
621 644
622 my $dbmd5 = db_get cache => "$id/md5"; 645 my $dbmd5 = db_get cache => "$id/md5";
… …
666attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
668 691
669In the following description, CLASS can be any of C<global>, C<object> 692In the following description, CLASS can be any of C<global>, C<object>
670C<player>, C<client> or C<map> (i.e. the attachable objects in 693C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 694Deliantra).
672 695
673=over 4 696=over 4
674 697
675=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
676 699
… …
958 } 981 }
959 982
960 0 983 0
961} 984}
962 985
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 987
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 989
967Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
968 991
… …
974 997
975=cut 998=cut
976 999
977############################################################################# 1000#############################################################################
978# object support 1001# object support
979#
980 1002
1003sub _object_equal($$);
1004sub _object_equal($$) {
1005 my ($a, $b) = @_;
1006
1007 return 0 unless (ref $a) eq (ref $b);
1008
1009 if ("HASH" eq ref $a) {
1010 my @ka = keys %$a;
1011 my @kb = keys %$b;
1012
1013 return 0 if @ka != @kb;
1014
1015 for (0 .. $#ka) {
1016 return 0 unless $ka[$_] eq $kb[$_];
1017 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1018 }
1019
1020 } elsif ("ARRAY" eq ref $a) {
1021
1022 return 0 if @$a != @$b;
1023
1024 for (0 .. $#$a) {
1025 return 0 unless _object_equal $a->[$_], $b->[$_];
1026 }
1027
1028 } elsif ($a ne $b) {
1029 return 0;
1030 }
1031
1032 1
1033}
1034
1035our $SLOW_MERGES;#d#
981sub _can_merge { 1036sub _can_merge {
982 my ($ob1, $ob2) = @_; 1037 my ($ob1, $ob2) = @_;
983 1038
984 local $Storable::canonical = 1; 1039 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1040
988 $fob1 eq $fob2 1041 # we do the slow way here
1042 return _object_equal $ob1, $ob2
989} 1043}
990 1044
991sub reattach { 1045sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1047 my ($obj) = @_;
… …
1015cf::attachable->attach ( 1069cf::attachable->attach (
1016 prio => -1000000, 1070 prio => -1000000,
1017 on_instantiate => sub { 1071 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
1019 1073
1020 $data = from_json $data; 1074 $data = decode_json $data;
1021 1075
1022 for (@$data) { 1076 for (@$data) {
1023 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
1024 1078
1025 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
… …
1041sub object_freezer_save { 1095sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1096 my ($filename, $rdata, $objs) = @_;
1043 1097
1044 sync_job { 1098 sync_job {
1045 if (length $$rdata) { 1099 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1101 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1102 $decname, length $$rdata, scalar @$objs;
1048 1103
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1107 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1108 close $fh;
1054 1109
1055 if (@$objs) { 1110 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1116 close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1118 }
… …
1071 } 1126 }
1072 } else { 1127 } else {
1073 aio_unlink $filename; 1128 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1129 aio_unlink "$filename.pst";
1075 } 1130 }
1076 } 1131 };
1077} 1132}
1078 1133
1079sub object_freezer_as_string { 1134sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1135 my ($rdata, $objs) = @_;
1081 1136
… …
1093 or return; 1148 or return;
1094 1149
1095 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1152 or return;
1153
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1154 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs};
1099 } 1156 }
1100 1157
1158 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1160 $decname, length $data, scalar @{$av || []};
1161
1103 return ($data, $av); 1162 ($data, $av)
1104} 1163}
1105 1164
1106=head2 COMMAND CALLBACKS 1165=head2 COMMAND CALLBACKS
1107 1166
1108=over 4 1167=over 4
… …
1186 my ($type, $reply, @payload) = 1245 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1246 "ARRAY" eq ref $msg
1188 ? @$msg 1247 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1248 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1249
1250 my @reply;
1251
1191 if (my $cb = $EXTCMD{$type}) { 1252 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1253 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1254 }
1255
1256 $pl->ext_reply ($reply, @reply)
1257 if $reply;
1258
1197 } else { 1259 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1260 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1261 }
1200 1262
1201 cf::override; 1263 cf::override;
… …
1254 my $msg = $@ ? "$v->{path}: $@\n" 1316 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1317 : "$v->{base}: extension inactive.\n";
1256 1318
1257 if (exists $v->{meta}{mandatory}) { 1319 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1320 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1321 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1322 }
1262 1323
1263 warn $msg; 1324 warn $msg;
1264 } 1325 }
1265 1326
… …
1290use Coro::AIO; 1351use Coro::AIO;
1291 1352
1292=head3 cf::player 1353=head3 cf::player
1293 1354
1294=over 4 1355=over 4
1356
1357=item cf::player::num_playing
1358
1359Returns the official number of playing players, as per the Crossfire metaserver rules.
1360
1361=cut
1362
1363sub num_playing {
1364 scalar grep
1365 $_->ob->map
1366 && !$_->hidden
1367 && !$_->ob->flag (cf::FLAG_WIZ),
1368 cf::player::list
1369}
1295 1370
1296=item cf::player::find $login 1371=item cf::player::find $login
1297 1372
1298Returns the given player object, loading it if necessary (might block). 1373Returns the given player object, loading it if necessary (might block).
1299 1374
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1410 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1411 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1412 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1413 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1414
1340 my $pl = load_pl path $login 1415 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1416 or return;
1417
1418 my $pl = cf::player::load_pl $f
1419 or return;
1420 local $cf::PLAYER_LOADING{$login} = $pl;
1421 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1422 $cf::PLAYER{$login} = $pl
1343 } 1423 }
1344 } 1424 }
1345} 1425}
1346 1426
… …
1356 1436
1357 aio_mkdir playerdir $pl, 0770; 1437 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1438 $pl->{last_save} = $cf::RUNTIME;
1359 1439
1360 $pl->save_pl ($path); 1440 $pl->save_pl ($path);
1361 Coro::cede; 1441 cf::cede_to_tick;
1362} 1442}
1363 1443
1364sub new($) { 1444sub new($) {
1365 my ($login) = @_; 1445 my ($login) = @_;
1366 1446
… …
1370 $self->{deny_save} = 1; 1450 $self->{deny_save} = 1;
1371 1451
1372 $cf::PLAYER{$login} = $self; 1452 $cf::PLAYER{$login} = $self;
1373 1453
1374 $self 1454 $self
1455}
1456
1457=item $player->send_msg ($channel, $msg, $color, [extra...])
1458
1459=cut
1460
1461sub send_msg {
1462 my $ns = shift->ns
1463 or return;
1464 $ns->send_msg (@_);
1375} 1465}
1376 1466
1377=item $pl->quit_character 1467=item $pl->quit_character
1378 1468
1379Nukes the player without looking back. If logged in, the connection will 1469Nukes the player without looking back. If logged in, the connection will
… …
1434 or return []; 1524 or return [];
1435 1525
1436 my @logins; 1526 my @logins;
1437 1527
1438 for my $login (@$dirs) { 1528 for my $login (@$dirs) {
1529 my $path = path $login;
1530
1531 # a .pst is a dead give-away for a valid player
1532 unless (-e "$path.pst") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1533 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1534 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1535 $buf !~ /^password -------------$/m or next; # official not-valid tag
1536 }
1442 1537
1443 utf8::decode $login; 1538 utf8::decode $login;
1444 push @logins, $login; 1539 push @logins, $login;
1445 } 1540 }
1446 1541
… …
1479 1574
1480Expand crossfire pod fragments into protocol xml. 1575Expand crossfire pod fragments into protocol xml.
1481 1576
1482=cut 1577=cut
1483 1578
1579use re 'eval';
1580
1581my $group;
1582my $interior; $interior = qr{
1583 # match a pod interior sequence sans C<< >>
1584 (?:
1585 \ (.*?)\ (?{ $group = $^N })
1586 | < (??{$interior}) >
1587 )
1588}x;
1589
1484sub expand_cfpod { 1590sub expand_cfpod {
1485 ((my $self), (local $_)) = @_; 1591 my ($self, $pod) = @_;
1486 1592
1487 # escape & and < 1593 my $xml;
1488 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g;
1490 1594
1491 # this is buggy, it needs to properly take care of nested <'s 1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1492 1598
1493 1 while 1599 $group =~ s/&/&amp;/g;
1494 # replace B<>, I<>, U<> etc. 1600 $group =~ s/</&lt;/g;
1495 s/B<([^\>]*)>/<b>$1<\/b>/ 1601
1496 || s/I<([^\>]*)>/<i>$1<\/i>/ 1602 $xml .= $group;
1497 || s/U<([^\>]*)>/<u>$1<\/u>/ 1603 } elsif ($pod =~ m%\G
1498 # replace G<male|female> tags 1604 ([BCGHITU])
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1605 <
1500 $self->gender ? $2 : $1 1606 (?:
1501 }ge 1607 ([^<>]*) (?{ $group = $^N })
1502 # replace H<hint text> 1608 | < $interior >
1503 || s{H<([^\>]*)>} 1609 )
1610 >
1611 %gcsx
1504 { 1612 ) {
1613 my ($code, $data) = ($1, $group);
1614
1615 if ($code eq "B") {
1616 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1617 } elsif ($code eq "I") {
1618 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1619 } elsif ($code eq "U") {
1620 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1621 } elsif ($code eq "C") {
1622 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1623 } elsif ($code eq "T") {
1624 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1625 } elsif ($code eq "G") {
1626 my ($male, $female) = split /\|/, $data;
1627 $data = $self->gender ? $female : $male;
1628 $xml .= expand_cfpod ($self, $data);
1629 } elsif ($code eq "H") {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1630 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "") 1632 "")
1508 [$self->{hintmode}] 1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1509 }ge; 1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1510 1644
1645 for ($xml) {
1511 # create single paragraphs (very hackish) 1646 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g; 1647 s/(?<=\S)\n(?=\w)/ /g;
1513 1648
1514 # compress some whitespace 1649 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends 1650 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines 1651 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines 1652 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines 1653 s/\n+$//; # ending lines
1654 }
1519 1655
1520 $_ 1656 $xml
1521} 1657}
1658
1659no re 'eval';
1522 1660
1523sub hintmode { 1661sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1; 1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode} 1663 $_[0]{hintmode}
1526} 1664}
… …
1532=cut 1670=cut
1533 1671
1534sub ext_reply($$@) { 1672sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1673 my ($self, $id, @msg) = @_;
1536 1674
1537 if ($self->ns->extcmd == 2) { 1675 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1676}
1545 1677
1546=item $player->ext_msg ($type, @msg) 1678=item $player->ext_msg ($type, @msg)
1547 1679
1548Sends an ext event to the client. 1680Sends an ext event to the client.
… …
1776 1908
1777sub load_header_from($) { 1909sub load_header_from($) {
1778 my ($self, $path) = @_; 1910 my ($self, $path) = @_;
1779 1911
1780 utf8::encode $path; 1912 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1913 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 or return; 1914 or return;
1915
1916 $self->_load_header ($f)
1917 or return;
1918
1919 local $MAP_LOADING{$self->{path}} = $self;
1920 $f->resolve_delayed_derefs;
1786 1921
1787 $self->{load_path} = $path; 1922 $self->{load_path} = $path;
1788 1923
1789 1 1924 1
1790} 1925}
… …
1844sub find { 1979sub find {
1845 my ($path, $origin) = @_; 1980 my ($path, $origin) = @_;
1846 1981
1847 $path = normalise $path, $origin && $origin->path; 1982 $path = normalise $path, $origin && $origin->path;
1848 1983
1984 cf::lock_wait "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 1985 cf::lock_wait "map_find:$path";
1850 1986
1851 $cf::MAP{$path} || do { 1987 $cf::MAP{$path} || do {
1852 my $guard = cf::lock_acquire "map_find:$path"; 1988 my $guard1 = cf::lock_acquire "map_find:$path";
1989 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1990
1853 my $map = new_from_path cf::map $path 1991 my $map = new_from_path cf::map $path
1854 or return; 1992 or return;
1855 1993
1856 $map->{last_save} = $cf::RUNTIME; 1994 $map->{last_save} = $cf::RUNTIME;
1857 1995
… …
1859 or return; 1997 or return;
1860 1998
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 2000 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 2001 #$cf::WAIT_FOR_TICK->wait;
2002 undef $guard1;
2003 undef $guard2;
1864 $map->reset; 2004 $map->reset;
1865 undef $guard;
1866 return find $path; 2005 return find $path;
1867 } 2006 }
1868 2007
1869 $cf::MAP{$path} = $map 2008 $cf::MAP{$path} = $map
1870 } 2009 }
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 2018 local $self->{deny_reset} = 1; # loading can take a long time
1880 2019
1881 my $path = $self->{path}; 2020 my $path = $self->{path};
1882 2021
1883 { 2022 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 2023 my $guard = cf::lock_acquire "map_data:$path";
1885 2024
2025 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 2026 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 2027
1888 $self->in_memory (cf::MAP_LOADING); 2028 $self->in_memory (cf::MAP_LOADING);
1889 2029
1890 $self->alloc; 2030 $self->alloc;
1891 2031
1892 $self->pre_load; 2032 $self->pre_load;
1893 Coro::cede; 2033 cf::cede_to_tick;
1894 2034
2035 my $f = new_from_file cf::object::thawer $self->{load_path};
2036 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 2037 $self->_load_objects ($f)
1896 or return; 2038 or return;
1897 2039
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2040 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899 if delete $self->{load_original}; 2041 if delete $self->{load_original};
1900 2042
1901 if (my $uniq = $self->uniq_path) { 2043 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 2044 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 2045 unless (aio_stat $uniq) {
2046 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 2047 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 2048 $self->_load_objects ($f);
2049 $f->resolve_delayed_derefs;
2050 }
1906 } 2051 }
1907 } 2052 }
1908 2053
1909 Coro::cede; 2054 $f->resolve_delayed_derefs;
2055
2056 cf::cede_to_tick;
1910 # now do the right thing for maps 2057 # now do the right thing for maps
1911 $self->link_multipart_objects; 2058 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 2059 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 2060 unless $self->difficulty;
1914 Coro::cede; 2061 cf::cede_to_tick;
1915 2062
1916 unless ($self->{deny_activate}) { 2063 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 2064 $self->decay_objects;
1918 $self->fix_auto_apply; 2065 $self->fix_auto_apply;
1919 $self->update_buttons; 2066 $self->update_buttons;
1920 Coro::cede; 2067 cf::cede_to_tick;
1921 $self->set_darkness_map; 2068 $self->set_darkness_map;
1922 Coro::cede; 2069 cf::cede_to_tick;
1923 $self->activate; 2070 $self->activate;
1924 } 2071 }
2072
2073 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME);
1925 2075
1926 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_IN_MEMORY);
1927 } 2077 }
1928 2078
1929 $self->post_load; 2079 $self->post_load;
… …
1940 2090
1941 $self 2091 $self
1942} 2092}
1943 2093
1944# find and load all maps in the 3x3 area around a map 2094# find and load all maps in the 3x3 area around a map
1945sub load_diag { 2095sub load_neighbours {
1946 my ($map) = @_; 2096 my ($map) = @_;
1947 2097
1948 my @diag; # diagonal neighbours 2098 my @neigh; # diagonal neighbours
1949 2099
1950 for (0 .. 3) { 2100 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 2101 my $neigh = $map->tile_path ($_)
1952 or next; 2102 or next;
1953 $neigh = find $neigh, $map 2103 $neigh = find $neigh, $map
1954 or next; 2104 or next;
1955 $neigh->load; 2105 $neigh->load;
1956 2106
2107 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 2110 }
1960 2111
1961 for (@diag) { 2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 2114 my $neigh = find $path, $origin
1963 or next; 2115 or next;
1964 $neigh->load; 2116 $neigh->load;
1965 } 2117 }
1966} 2118}
1967 2119
… …
1972} 2124}
1973 2125
1974sub do_load_sync { 2126sub do_load_sync {
1975 my ($map) = @_; 2127 my ($map) = @_;
1976 2128
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main;
2131
1977 cf::sync_job { $map->load }; 2132 cf::sync_job { $map->load };
1978} 2133}
1979 2134
1980our %MAP_PREFETCH; 2135our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 2136our $MAP_PREFETCHER = undef;
1982 2137
1983sub find_async { 2138sub find_async {
1984 my ($path, $origin) = @_; 2139 my ($path, $origin, $load) = @_;
1985 2140
1986 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
1987 2142
1988 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1990 } 2145 }
1991 2146
1992 undef $MAP_PREFETCH{$path}; 2147 $MAP_PREFETCH{$path} |= $load;
2148
1993 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
1994 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 2154 if (my $map = find $k) {
1997 $map->load; 2155 $map->load if $v;
1998 } 2156 }
1999 2157
2000 delete $MAP_PREFETCH{$path}; 2158 delete $MAP_PREFETCH{$k};
2001 } 2159 }
2002 } 2160 }
2003 undef $MAP_PREFETCHER; 2161 undef $MAP_PREFETCHER;
2004 }; 2162 };
2005 $MAP_PREFETCHER->prio (6); 2163 $MAP_PREFETCHER->prio (6);
… …
2008} 2166}
2009 2167
2010sub save { 2168sub save {
2011 my ($self) = @_; 2169 my ($self) = @_;
2012 2170
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 2172
2015 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
2016 2174
2017 return unless $self->dirty; 2175 return unless $self->dirty;
2018 2176
… …
2024 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2025 2183
2026 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
2027 2185
2028 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
2029 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2030 }; 2189 };
2031 2190
2032 if ($uniq) { 2191 if ($uniq) {
2033 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2041 my ($self) = @_; 2200 my ($self) = @_;
2042 2201
2043 # save first because save cedes 2202 # save first because save cedes
2044 $self->save; 2203 $self->save;
2045 2204
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2205 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2206
2048 return if $self->players; 2207 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2208 return if $self->in_memory != cf::MAP_IN_MEMORY;
2050 return if $self->{deny_save}; 2209 return if $self->{deny_save};
2051 2210
2211 $self->in_memory (cf::MAP_SWAPPED);
2212
2213 $self->deactivate;
2214 $_->clear_links_to ($self) for values %cf::MAP;
2052 $self->clear; 2215 $self->clear;
2053 $self->in_memory (cf::MAP_SWAPPED);
2054} 2216}
2055 2217
2056sub reset_at { 2218sub reset_at {
2057 my ($self) = @_; 2219 my ($self) = @_;
2058 2220
… …
2090 if $uniq; 2252 if $uniq;
2091 } 2253 }
2092 2254
2093 delete $cf::MAP{$self->path}; 2255 delete $cf::MAP{$self->path};
2094 2256
2257 $self->deactivate;
2258 $_->clear_links_to ($self) for values %cf::MAP;
2095 $self->clear; 2259 $self->clear;
2096
2097 $_->clear_links_to ($self) for values %cf::MAP;
2098 2260
2099 $self->unlink_save; 2261 $self->unlink_save;
2100 $self->destroy; 2262 $self->destroy;
2101} 2263}
2102 2264
2103my $nuke_counter = "aaaa"; 2265my $nuke_counter = "aaaa";
2104 2266
2105sub nuke { 2267sub nuke {
2106 my ($self) = @_; 2268 my ($self) = @_;
2107 2269
2270 {
2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2272
2108 delete $cf::MAP{$self->path}; 2273 delete $cf::MAP{$self->path};
2109 2274
2110 $self->unlink_save; 2275 $self->unlink_save;
2111 2276
2112 bless $self, "cf::map"; 2277 bless $self, "cf::map";
2113 delete $self->{deny_reset}; 2278 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2279 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2280 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2281 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2282
2118 $cf::MAP{$self->path} = $self; 2283 $cf::MAP{$self->path} = $self;
2284 }
2119 2285
2120 $self->reset; # polite request, might not happen 2286 $self->reset; # polite request, might not happen
2121} 2287}
2122 2288
2123=item $maps = cf::map::tmp_maps 2289=item $maps = cf::map::tmp_maps
… …
2199 2365
2200sub inv_recursive { 2366sub inv_recursive {
2201 inv_recursive_ inv $_[0] 2367 inv_recursive_ inv $_[0]
2202} 2368}
2203 2369
2370=item $ref = $ob->ref
2371
2372creates and returns a persistent reference to an objetc that can be stored as a string.
2373
2374=item $ob = cf::object::deref ($refstring)
2375
2376returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2377even if the object actually exists. May block.
2378
2379=cut
2380
2381sub deref {
2382 my ($ref) = @_;
2383
2384 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2385 my ($uuid, $name) = ($1, $2);
2386 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2387 or return;
2388 $pl->ob->uuid eq $uuid
2389 or return;
2390
2391 $pl->ob
2392 } else {
2393 warn "$ref: cannot resolve object reference\n";
2394 undef
2395 }
2396}
2397
2204package cf; 2398package cf;
2205 2399
2206=back 2400=back
2207 2401
2208=head3 cf::object::player 2402=head3 cf::object::player
… …
2240 $self->message ($msg, $flags); 2434 $self->message ($msg, $flags);
2241 } 2435 }
2242 } 2436 }
2243} 2437}
2244 2438
2439=item $object->send_msg ($channel, $msg, $color, [extra...])
2440
2441=cut
2442
2443sub cf::object::send_msg {
2444 my $pl = shift->contr
2445 or return;
2446 $pl->send_msg (@_);
2447}
2448
2245=item $player_object->may ("access") 2449=item $player_object->may ("access")
2246 2450
2247Returns wether the given player is authorized to access resource "access" 2451Returns wether the given player is authorized to access resource "access"
2248(e.g. "command_wizcast"). 2452(e.g. "command_wizcast").
2249 2453
… …
2326 # use -1 or undef as default coordinates, not 0, 0 2530 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2531 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2532 if $x <=0 && $y <= 0;
2329 2533
2330 $map->load; 2534 $map->load;
2331 $map->load_diag; 2535 $map->load_neighbours;
2332 2536
2333 return unless $self->contr->active; 2537 return unless $self->contr->active;
2334 $self->activate_recursive; 2538 $self->activate_recursive;
2335 2539
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2356 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2560 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2357 2561
2358 $self->enter_link; 2562 $self->enter_link;
2359 2563
2360 (async { 2564 (async {
2565 $Coro::current->{desc} = "player::goto $path $x $y";
2566
2567 # *tag paths override both path and x|y
2568 if ($path =~ /^\*(.*)$/) {
2569 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2570 my $ob = $obs[rand @obs];
2571
2572 # see if we actually can go there
2573 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2574 $ob = $obs[rand @obs];
2575 } else {
2576 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2577 }
2578 # else put us there anyways for now #d#
2579
2580 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2581 } else {
2582 ($path, $x, $y) = (undef, undef, undef);
2583 }
2584 }
2585
2361 my $map = eval { 2586 my $map = eval {
2362 my $map = cf::map::find $path; 2587 my $map = defined $path ? cf::map::find $path : undef;
2363 2588
2364 if ($map) { 2589 if ($map) {
2365 $map = $map->customise_for ($self); 2590 $map = $map->customise_for ($self);
2366 $map = $check->($map) if $check && $map; 2591 $map = $check->($map) if $check && $map;
2367 } else { 2592 } else {
2368 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2593 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2369 } 2594 }
2370 2595
2371 $map 2596 $map
2372 }; 2597 };
2373 2598
… …
2426 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2427 } 2652 }
2428 2653
2429 $rmp->{random_seed} ||= $exit->random_seed; 2654 $rmp->{random_seed} ||= $exit->random_seed;
2430 2655
2431 my $data = cf::to_json $rmp; 2656 my $data = cf::encode_json $rmp;
2432 my $md5 = Digest::MD5::md5_hex $data; 2657 my $md5 = Digest::MD5::md5_hex $data;
2433 my $meta = "$RANDOMDIR/$md5.meta"; 2658 my $meta = "$RANDOMDIR/$md5.meta";
2434 2659
2435 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2436 aio_write $fh, 0, (length $data), $data, 0; 2661 aio_write $fh, 0, (length $data), $data, 0;
… …
2463 # if exit is damned, update players death & WoR home-position 2688 # if exit is damned, update players death & WoR home-position
2464 $self->contr->savebed ($slaying, $hp, $sp) 2689 $self->contr->savebed ($slaying, $hp, $sp)
2465 if $exit->flag (FLAG_DAMNED); 2690 if $exit->flag (FLAG_DAMNED);
2466 2691
2467 (async { 2692 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2694
2468 $self->deactivate_recursive; # just to be sure 2695 $self->deactivate_recursive; # just to be sure
2469 unless (eval { 2696 unless (eval {
2470 $self->goto ($slaying, $hp, $sp); 2697 $self->goto ($slaying, $hp, $sp);
2471 2698
2472 1; 2699 1;
… …
2507the message, with C<log> being the default. If C<$color> is negative, suppress 2734the message, with C<log> being the default. If C<$color> is negative, suppress
2508the message unless the client supports the msg packet. 2735the message unless the client supports the msg packet.
2509 2736
2510=cut 2737=cut
2511 2738
2739# non-persistent channels (usually the info channel)
2740our %CHANNEL = (
2741 "c/identify" => {
2742 id => "infobox",
2743 title => "Identify",
2744 reply => undef,
2745 tooltip => "Items recently identified",
2746 },
2747 "c/examine" => {
2748 id => "infobox",
2749 title => "Examine",
2750 reply => undef,
2751 tooltip => "Signs and other items you examined",
2752 },
2753 "c/book" => {
2754 id => "infobox",
2755 title => "Book",
2756 reply => undef,
2757 tooltip => "The contents of a note or book",
2758 },
2759 "c/lookat" => {
2760 id => "infobox",
2761 title => "Look",
2762 reply => undef,
2763 tooltip => "What you saw there",
2764 },
2765 "c/who" => {
2766 id => "infobox",
2767 title => "Players",
2768 reply => undef,
2769 tooltip => "Shows players who are currently online",
2770 },
2771 "c/body" => {
2772 id => "infobox",
2773 title => "Body Parts",
2774 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available",
2776 },
2777 "c/uptime" => {
2778 id => "infobox",
2779 title => "Uptime",
2780 reply => undef,
2781 tooltip => "How long the server has been running since last restart",
2782 },
2783 "c/mapinfo" => {
2784 id => "infobox",
2785 title => "Map Info",
2786 reply => undef,
2787 tooltip => "Information related to the maps",
2788 },
2789);
2790
2512sub cf::client::send_msg { 2791sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2792 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2793
2515 $msg = $self->pl->expand_cfpod ($msg); 2794 $msg = $self->pl->expand_cfpod ($msg);
2516 2795
2517 $color &= cf::NDI_CLIENT_MASK; # just in case... 2796 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518 2797
2798 # check predefined channels, for the benefit of C
2799 if ($CHANNEL{$channel}) {
2800 $channel = $CHANNEL{$channel};
2801
2802 $self->ext_msg (channel_info => $channel)
2803 if $self->can_msg;
2804
2805 $channel = $channel->{id};
2806
2519 if (ref $channel) { 2807 } elsif (ref $channel) {
2520 # send meta info to client, if not yet sent 2808 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2809 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2810 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => $channel); 2811 $self->ext_msg (channel_info => $channel)
2812 if $self->can_msg;
2524 } 2813 }
2525 2814
2526 $channel = $channel->{id}; 2815 $channel = $channel->{id};
2527 } 2816 }
2528 2817
… …
2547 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; 2836 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2548 } 2837 }
2549 2838
2550 $color &= cf::NDI_COLOR_MASK; 2839 $color &= cf::NDI_COLOR_MASK;
2551 2840
2841 utf8::encode $msg;
2842
2552 if (0 && $msg =~ /\[/) { 2843 if (0 && $msg =~ /\[/) {
2844 # COMMAND/INFO
2553 $self->send_packet ("drawextinfo $color 4 0 $msg") 2845 $self->send_packet ("drawextinfo $color 10 8 $msg")
2554 } else { 2846 } else {
2555 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2847 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2556 $self->send_packet ("drawinfo $color $msg") 2848 $self->send_packet ("drawinfo $color $msg")
2557 } 2849 }
2558 } 2850 }
… …
2566=cut 2858=cut
2567 2859
2568sub cf::client::ext_msg($$@) { 2860sub cf::client::ext_msg($$@) {
2569 my ($self, $type, @msg) = @_; 2861 my ($self, $type, @msg) = @_;
2570 2862
2571 my $extcmd = $self->extcmd;
2572
2573 if ($extcmd == 2) { 2863 if ($self->extcmd == 2) {
2574 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2864 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2575 } elsif ($extcmd == 1) { # TODO: remove 2865 } elsif ($self->extcmd == 1) { # TODO: remove
2576 push @msg, msgtype => "event_$type"; 2866 push @msg, msgtype => "event_$type";
2867 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2868 }
2869}
2870
2871=item $client->ext_reply ($msgid, @msg)
2872
2873Sends an ext reply to the client.
2874
2875=cut
2876
2877sub cf::client::ext_reply($$@) {
2878 my ($self, $id, @msg) = @_;
2879
2880 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2882 } elsif ($self->extcmd == 1) {
2883 #TODO: version 1, remove
2884 unshift @msg, msgtype => "reply", msgid => $id;
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2885 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2578 } 2886 }
2579} 2887}
2580 2888
2581=item $success = $client->query ($flags, "text", \&cb) 2889=item $success = $client->query ($flags, "text", \&cb)
… …
2643 my ($type, $reply, @payload) = 2951 my ($type, $reply, @payload) =
2644 "ARRAY" eq ref $msg 2952 "ARRAY" eq ref $msg
2645 ? @$msg 2953 ? @$msg
2646 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2954 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2647 2955
2956 my @reply;
2957
2648 if (my $cb = $EXTICMD{$type}) { 2958 if (my $cb = $EXTICMD{$type}) {
2649 my @reply = $cb->($ns, @payload); 2959 @reply = $cb->($ns, @payload);
2650
2651 $ns->ext_reply ($reply, @reply)
2652 if $reply;
2653 } 2960 }
2961
2962 $ns->ext_reply ($reply, @reply)
2963 if $reply;
2964
2654 } else { 2965 } else {
2655 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2966 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2656 } 2967 }
2657 2968
2658 cf::override; 2969 cf::override;
… …
2705our $safe = new Safe "safe"; 3016our $safe = new Safe "safe";
2706our $safe_hole = new Safe::Hole; 3017our $safe_hole = new Safe::Hole;
2707 3018
2708$SIG{FPE} = 'IGNORE'; 3019$SIG{FPE} = 'IGNORE';
2709 3020
2710$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3021$safe->permit_only (Opcode::opset qw(
3022 :base_core :base_mem :base_orig :base_math
3023 grepstart grepwhile mapstart mapwhile
3024 sort time
3025));
2711 3026
2712# here we export the classes and methods available to script code 3027# here we export the classes and methods available to script code
2713 3028
2714=pod 3029=pod
2715 3030
2716The following functions and methods are available within a safe environment: 3031The following functions and methods are available within a safe environment:
2717 3032
2718 cf::object 3033 cf::object
2719 contr pay_amount pay_player map x y force_find force_add 3034 contr pay_amount pay_player map x y force_find force_add destroy
2720 insert remove 3035 insert remove name archname title slaying race decrease_ob_nr
2721 3036
2722 cf::object::player 3037 cf::object::player
2723 player 3038 player
2724 3039
2725 cf::player 3040 cf::player
… …
2730 3045
2731=cut 3046=cut
2732 3047
2733for ( 3048for (
2734 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3050 insert remove inv name archname title slaying race
2735 insert remove)], 3051 decrease_ob_nr destroy)],
2736 ["cf::object::player" => qw(player)], 3052 ["cf::object::player" => qw(player)],
2737 ["cf::player" => qw(peaceful)], 3053 ["cf::player" => qw(peaceful)],
2738 ["cf::map" => qw(trigger)], 3054 ["cf::map" => qw(trigger)],
2739) { 3055) {
2740 no strict 'refs'; 3056 no strict 'refs';
… …
2816# the server's init and main functions 3132# the server's init and main functions
2817 3133
2818sub load_facedata($) { 3134sub load_facedata($) {
2819 my ($path) = @_; 3135 my ($path) = @_;
2820 3136
3137 # HACK to clear player env face cache, we need some signal framework
3138 # for this (global event?)
3139 %ext::player_env::MUSIC_FACE_CACHE = ();
3140
3141 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3142
2821 warn "loading facedata from $path\n"; 3143 warn "loading facedata from $path\n";
2822 3144
2823 my $facedata; 3145 my $facedata;
2824 0 < aio_load $path, $facedata 3146 0 < aio_load $path, $facedata
2825 or die "$path: $!"; 3147 or die "$path: $!";
… …
2827 $facedata = Coro::Storable::thaw $facedata; 3149 $facedata = Coro::Storable::thaw $facedata;
2828 3150
2829 $facedata->{version} == 2 3151 $facedata->{version} == 2
2830 or cf::cleanup "$path: version mismatch, cannot proceed."; 3152 or cf::cleanup "$path: version mismatch, cannot proceed.";
2831 3153
3154 # patch in the exptable
3155 $facedata->{resource}{"res/exp_table"} = {
3156 type => FT_RSRC,
3157 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3158 };
3159 cf::cede_to_tick;
3160
2832 { 3161 {
2833 my $faces = $facedata->{faceinfo}; 3162 my $faces = $facedata->{faceinfo};
2834 3163
2835 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
2836 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3165 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166
2837 cf::face::set_visibility $idx, $info->{visibility}; 3167 cf::face::set_visibility $idx, $info->{visibility};
2838 cf::face::set_magicmap $idx, $info->{magicmap}; 3168 cf::face::set_magicmap $idx, $info->{magicmap};
2839 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3169 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2840 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3170 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2841 3171
2842 cf::cede_to_tick; 3172 cf::cede_to_tick;
2843 } 3173 }
2844 3174
2845 while (my ($face, $info) = each %$faces) { 3175 while (my ($face, $info) = each %$faces) {
2846 next unless $info->{smooth}; 3176 next unless $info->{smooth};
3177
2847 my $idx = cf::face::find $face 3178 my $idx = cf::face::find $face
2848 or next; 3179 or next;
3180
2849 if (my $smooth = cf::face::find $info->{smooth}) { 3181 if (my $smooth = cf::face::find $info->{smooth}) {
2850 cf::face::set_smooth $idx, $smooth; 3182 cf::face::set_smooth $idx, $smooth;
2851 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3183 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2852 } else { 3184 } else {
2853 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3185 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2870 3202
2871 { 3203 {
2872 # TODO: for gcfclient pleasure, we should give resources 3204 # TODO: for gcfclient pleasure, we should give resources
2873 # that gcfclient doesn't grok a >10000 face index. 3205 # that gcfclient doesn't grok a >10000 face index.
2874 my $res = $facedata->{resource}; 3206 my $res = $facedata->{resource};
2875 my $enc = JSON::XS->new->utf8->canonical;
2876
2877 my $soundconf = delete $res->{"res/sound.conf"};
2878 3207
2879 while (my ($name, $info) = each %$res) { 3208 while (my ($name, $info) = each %$res) {
2880 my $meta = $enc->encode ({ 3209 if (defined $info->{type}) {
2881 name => $name,
2882 %{ $info->{meta} || {} },
2883 });
2884
2885 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3210 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3211 my $data;
2886 3212
2887 if ($info->{type} & 1) { 3213 if ($info->{type} & 1) {
2888 # prepend meta info 3214 # prepend meta info
2889 3215
3216 my $meta = $enc->encode ({
3217 name => $name,
3218 %{ $info->{meta} || {} },
3219 });
3220
2890 my $data = pack "(w/a*)*", $meta, $info->{data}; 3221 $data = pack "(w/a*)*", $meta, $info->{data};
2891 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3222 } else {
3223 $data = $info->{data};
3224 }
2892 3225
2893 cf::face::set_data $idx, 0, $data, $chk; 3226 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3227 cf::face::set_type $idx, $info->{type};
2894 } else { 3228 } else {
2895 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3229 $RESOURCE{$name} = $info;
2896 } 3230 }
2897 3231
2898 cf::face::set_type $idx, $info->{type};
2899
2900 cf::cede_to_tick; 3232 cf::cede_to_tick;
2901 } 3233 }
2902
2903 if ($soundconf) {
2904 $soundconf = $enc->decode (delete $soundconf->{data});
2905
2906 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2907 my $sound = $soundconf->{compat}[$_]
2908 or next;
2909
2910 my $face = cf::face::find "sound/$sound->[1]";
2911
2912 cf::sound::set $sound->[0] => $face;
2913 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2914 }
2915
2916 #TODO
2917 }
2918 } 3234 }
3235
3236 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2919 3237
2920 1 3238 1
2921} 3239}
3240
3241cf::global->attach (on_resource_update => sub {
3242 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3243 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3244
3245 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3246 my $sound = $soundconf->{compat}[$_]
3247 or next;
3248
3249 my $face = cf::face::find "sound/$sound->[1]";
3250 cf::sound::set $sound->[0] => $face;
3251 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3252 }
3253
3254 while (my ($k, $v) = each %{$soundconf->{event}}) {
3255 my $face = cf::face::find "sound/$v";
3256 cf::sound::set $k => $face;
3257 }
3258 }
3259});
2922 3260
2923register_exticmd fx_want => sub { 3261register_exticmd fx_want => sub {
2924 my ($ns, $want) = @_; 3262 my ($ns, $want) = @_;
2925 3263
2926 while (my ($k, $v) = each %$want) { 3264 while (my ($k, $v) = each %$want) {
2927 $ns->fx_want ($k, $v); 3265 $ns->fx_want ($k, $v);
2928 } 3266 }
2929}; 3267};
2930 3268
2931sub reload_regions { 3269sub reload_regions {
3270 # HACK to clear player env face cache, we need some signal framework
3271 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = ();
3273
2932 load_resource_file "$MAPDIR/regions" 3274 load_resource_file "$MAPDIR/regions"
2933 or die "unable to load regions file\n"; 3275 or die "unable to load regions file\n";
2934 3276
2935 for (cf::region::list) { 3277 for (cf::region::list) {
2936 $_->{match} = qr/$_->{match}/ 3278 $_->{match} = qr/$_->{match}/
… …
2972 3314
2973sub init { 3315sub init {
2974 reload_resources; 3316 reload_resources;
2975} 3317}
2976 3318
2977sub cfg_load { 3319sub reload_config {
2978 open my $fh, "<:utf8", "$CONFDIR/config" 3320 open my $fh, "<:utf8", "$CONFDIR/config"
2979 or return; 3321 or return;
2980 3322
2981 local $/; 3323 local $/;
2982 *CFG = YAML::Syck::Load <$fh>; 3324 *CFG = YAML::Load <$fh>;
2983 3325
2984 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2985 3327
2986 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3328 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2987 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3329 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2998sub main { 3340sub main {
2999 # we must not ever block the main coroutine 3341 # we must not ever block the main coroutine
3000 local $Coro::idle = sub { 3342 local $Coro::idle = sub {
3001 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3343 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3002 (async { 3344 (async {
3003 Event::one_event; 3345 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT;
3004 })->prio (Coro::PRIO_MAX); 3347 })->prio (Coro::PRIO_MAX);
3005 }; 3348 };
3006 3349
3007 cfg_load; 3350 reload_config;
3008 db_init; 3351 db_init;
3009 load_extensions; 3352 load_extensions;
3010 3353
3011 $TICK_WATCHER->start; 3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3012 Event::loop; 3356 EV::loop;
3013} 3357}
3014 3358
3015############################################################################# 3359#############################################################################
3016# initialisation and cleanup 3360# initialisation and cleanup
3017 3361
3018# install some emergency cleanup handlers 3362# install some emergency cleanup handlers
3019BEGIN { 3363BEGIN {
3364 our %SIGWATCHER = ();
3020 for my $signal (qw(INT HUP TERM)) { 3365 for my $signal (qw(INT HUP TERM)) {
3021 Event->signal ( 3366 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3022 reentrant => 0,
3023 data => WF_AUTOCANCEL,
3024 signal => $signal,
3025 prio => 0,
3026 cb => sub {
3027 cf::cleanup "SIG$signal"; 3367 cf::cleanup "SIG$signal";
3028 },
3029 ); 3368 };
3030 } 3369 }
3031} 3370}
3032 3371
3033sub write_runtime { 3372sub write_runtime {
3034 my $runtime = "$LOCALDIR/runtime"; 3373 my $runtime = "$LOCALDIR/runtime";
… …
3079 # and maps saved/destroyed asynchronously. 3418 # and maps saved/destroyed asynchronously.
3080 warn "begin emergency player save\n"; 3419 warn "begin emergency player save\n";
3081 for my $login (keys %cf::PLAYER) { 3420 for my $login (keys %cf::PLAYER) {
3082 my $pl = $cf::PLAYER{$login} or next; 3421 my $pl = $cf::PLAYER{$login} or next;
3083 $pl->valid or next; 3422 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3084 $pl->save; 3424 $pl->save;
3085 } 3425 }
3086 warn "end emergency player save\n"; 3426 warn "end emergency player save\n";
3087 3427
3088 warn "begin emergency map save\n"; 3428 warn "begin emergency map save\n";
… …
3127 warn "syncing database to disk"; 3467 warn "syncing database to disk";
3128 BDB::db_env_txn_checkpoint $DB_ENV; 3468 BDB::db_env_txn_checkpoint $DB_ENV;
3129 3469
3130 # if anything goes wrong in here, we should simply crash as we already saved 3470 # if anything goes wrong in here, we should simply crash as we already saved
3131 3471
3132 warn "cancelling all WF_AUTOCANCEL watchers";
3133 for (Event::all_watchers) {
3134 $_->cancel if $_->data & WF_AUTOCANCEL;
3135 }
3136
3137 warn "flushing outstanding aio requests"; 3472 warn "flushing outstanding aio requests";
3138 for (;;) { 3473 for (;;) {
3139 BDB::flush; 3474 BDB::flush;
3140 IO::AIO::flush; 3475 IO::AIO::flush;
3141 Coro::cede; 3476 Coro::cede_notself;
3142 last unless IO::AIO::nreqs || BDB::nreqs; 3477 last unless IO::AIO::nreqs || BDB::nreqs;
3143 warn "iterate..."; 3478 warn "iterate...";
3144 } 3479 }
3145 3480
3146 ++$RELOAD; 3481 ++$RELOAD;
… …
3205 warn "reloading cf.pm"; 3540 warn "reloading cf.pm";
3206 require cf; 3541 require cf;
3207 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3542 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3208 3543
3209 warn "loading config and database again"; 3544 warn "loading config and database again";
3210 cf::cfg_load; 3545 cf::reload_config;
3211 3546
3212 warn "loading extensions"; 3547 warn "loading extensions";
3213 cf::load_extensions; 3548 cf::load_extensions;
3214 3549
3215 warn "reattaching attachments to objects/players"; 3550 warn "reattaching attachments to objects/players";
… …
3222 warn "leaving sync_job"; 3557 warn "leaving sync_job";
3223 3558
3224 1 3559 1
3225 } or do { 3560 } or do {
3226 warn $@; 3561 warn $@;
3227 warn "error while reloading, exiting."; 3562 cf::cleanup "error while reloading, exiting.";
3228 exit 1;
3229 }; 3563 };
3230 3564
3231 warn "reloaded"; 3565 warn "reloaded";
3232}; 3566};
3233 3567
… …
3235 3569
3236sub reload_perl() { 3570sub reload_perl() {
3237 # doing reload synchronously and two reloads happen back-to-back, 3571 # doing reload synchronously and two reloads happen back-to-back,
3238 # coro crashes during coro_state_free->destroy here. 3572 # coro crashes during coro_state_free->destroy here.
3239 3573
3240 $RELOAD_WATCHER ||= Event->timer ( 3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3241 reentrant => 0,
3242 after => 0,
3243 data => WF_AUTOCANCEL,
3244 cb => sub {
3245 do_reload_perl; 3575 do_reload_perl;
3246 undef $RELOAD_WATCHER; 3576 undef $RELOAD_WATCHER;
3247 },
3248 ); 3577 };
3249} 3578}
3250 3579
3251register_command "reload" => sub { 3580register_command "reload" => sub {
3252 my ($who, $arg) = @_; 3581 my ($who, $arg) = @_;
3253 3582
3254 if ($who->flag (FLAG_WIZ)) { 3583 if ($who->flag (FLAG_WIZ)) {
3255 $who->message ("reloading server."); 3584 $who->message ("reloading server.");
3585 async {
3586 $Coro::current->{desc} = "perl_reload";
3256 async { reload_perl }; 3587 reload_perl;
3588 };
3257 } 3589 }
3258}; 3590};
3259 3591
3260unshift @INC, $LIBDIR; 3592unshift @INC, $LIBDIR;
3261 3593
… …
3280 my $signal = new Coro::Signal; 3612 my $signal = new Coro::Signal;
3281 push @WAIT_FOR_TICK_BEGIN, $signal; 3613 push @WAIT_FOR_TICK_BEGIN, $signal;
3282 $signal->wait; 3614 $signal->wait;
3283} 3615}
3284 3616
3285 my $min = 1e6;#d# 3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3286 my $avg = 10;
3287$TICK_WATCHER = Event->timer (
3288 reentrant => 0,
3289 parked => 1,
3290 prio => 0,
3291 at => $NEXT_TICK || $TICK,
3292 data => WF_AUTOCANCEL,
3293 cb => sub {
3294 if ($Coro::current != $Coro::main) { 3618 if ($Coro::current != $Coro::main) {
3295 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3296 unless ++$bug_warning > 10; 3620 unless ++$bug_warning > 10;
3297 return; 3621 return;
3298 } 3622 }
3299 3623
3300 $NOW = $tick_start = Event::time; 3624 $NOW = $tick_start = EV::now;
3301 3625
3302 cf::server_tick; # one server iteration 3626 cf::server_tick; # one server iteration
3303 3627
3304 0 && sync_job {#d# 3628 $RUNTIME += $TICK;
3305 for(1..10) { 3629 $NEXT_TICK = $_[0]->at;
3306 my $t = Event::time;
3307 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3308 or die;
3309 3630
3310 $map->width (50); 3631 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3311 $map->height (50); 3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3312 $map->alloc; 3633 Coro::async_pool {
3313 $map->_load_objects ("/tmp/x.map", 1); 3634 $Coro::current->{desc} = "runtime saver";
3314 my $t = Event::time - $t; 3635 write_runtime
3315 3636 or warn "ERROR: unable to write runtime file: $!";
3316 #next unless $t < 0.0013;#d#
3317 if ($t < $min) {
3318 $min = $t;
3319 }
3320 $avg = $avg * 0.99 + $t * 0.01;
3321 }
3322 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3323 exit 0;
3324 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3325 }; 3637 };
3638 }
3326 3639
3327 $RUNTIME += $TICK;
3328 $NEXT_TICK += $TICK;
3329
3330 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3331 $NEXT_RUNTIME_WRITE = $NOW + 10;
3332 Coro::async_pool {
3333 write_runtime
3334 or warn "ERROR: unable to write runtime file: $!";
3335 };
3336 }
3337
3338# my $AFTER = Event::time;
3339# warn $AFTER - $NOW;#d#
3340
3341 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3342 $sig->send; 3641 $sig->send;
3343 } 3642 }
3344 while (my $sig = shift @WAIT_FOR_TICK) { 3643 while (my $sig = shift @WAIT_FOR_TICK) {
3345 $sig->send; 3644 $sig->send;
3346 } 3645 }
3347 3646
3348 $NOW = Event::time;
3349
3350 # if we are delayed by four ticks or more, skip them all
3351 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3352
3353 $TICK_WATCHER->at ($NEXT_TICK);
3354 $TICK_WATCHER->start;
3355
3356 $LOAD = ($NOW - $tick_start) / $TICK; 3647 $LOAD = ($NOW - $tick_start) / $TICK;
3357 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3358 3649
3359 _post_tick; 3650 _post_tick;
3360 3651};
3361 3652$TICK_WATCHER->priority (EV::MAXPRI);
3362 },
3363);
3364 3653
3365{ 3654{
3366 BDB::max_poll_time $TICK * 0.1; 3655 # configure BDB
3367 $BDB_POLL_WATCHER = Event->io ( 3656
3368 reentrant => 0,
3369 fd => BDB::poll_fileno,
3370 poll => 'r',
3371 prio => 0,
3372 data => WF_AUTOCANCEL,
3373 cb => \&BDB::poll_cb,
3374 );
3375 BDB::min_parallel 8; 3657 BDB::min_parallel 8;
3376 3658 BDB::max_poll_reqs $TICK * 0.1;
3377 BDB::set_sync_prepare { 3659 $Coro::BDB::WATCHER->priority (1);
3378 my $status;
3379 my $current = $Coro::current;
3380 (
3381 sub {
3382 $status = $!;
3383 $current->ready; undef $current;
3384 },
3385 sub {
3386 Coro::schedule while defined $current;
3387 $! = $status;
3388 },
3389 )
3390 };
3391 3660
3392 unless ($DB_ENV) { 3661 unless ($DB_ENV) {
3393 $DB_ENV = BDB::db_env_create; 3662 $DB_ENV = BDB::db_env_create;
3663 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3664 | BDB::LOG_AUTOREMOVE, 1);
3665 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3666 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3394 3667
3395 cf::sync_job { 3668 cf::sync_job {
3396 eval { 3669 eval {
3397 BDB::db_env_open 3670 BDB::db_env_open
3398 $DB_ENV, 3671 $DB_ENV,
… …
3400 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3673 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3401 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3674 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3402 0666; 3675 0666;
3403 3676
3404 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3677 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3405
3406 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3407 $DB_ENV->set_lk_detect;
3408 }; 3678 };
3409 3679
3410 cf::cleanup "db_env_open(db): $@" if $@; 3680 cf::cleanup "db_env_open(db): $@" if $@;
3411 }; 3681 };
3412 } 3682 }
3683
3684 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3685 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3686 };
3687 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3688 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3689 };
3690 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3691 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3692 };
3413} 3693}
3414 3694
3415{ 3695{
3696 # configure IO::AIO
3697
3416 IO::AIO::min_parallel 8; 3698 IO::AIO::min_parallel 8;
3417
3418 undef $Coro::AIO::WATCHER;
3419 IO::AIO::max_poll_time $TICK * 0.1; 3699 IO::AIO::max_poll_time $TICK * 0.1;
3420 $AIO_POLL_WATCHER = Event->io ( 3700 $Coro::AIO::WATCHER->priority (1);
3421 reentrant => 0,
3422 data => WF_AUTOCANCEL,
3423 fd => IO::AIO::poll_fileno,
3424 poll => 'r',
3425 prio => 6,
3426 cb => \&IO::AIO::poll_cb,
3427 );
3428} 3701}
3429 3702
3430my $_log_backtrace; 3703my $_log_backtrace;
3431 3704
3432sub _log_backtrace { 3705sub _log_backtrace {
… …
3436 3709
3437 # limit the # of concurrent backtraces 3710 # limit the # of concurrent backtraces
3438 if ($_log_backtrace < 2) { 3711 if ($_log_backtrace < 2) {
3439 ++$_log_backtrace; 3712 ++$_log_backtrace;
3440 async { 3713 async {
3714 $Coro::current->{desc} = "abt $msg";
3715
3441 my @bt = fork_call { 3716 my @bt = fork_call {
3442 @addr = map { sprintf "%x", $_ } @addr; 3717 @addr = map { sprintf "%x", $_ } @addr;
3443 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3718 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3444 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3719 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3445 or die "addr2line: $!"; 3720 or die "addr2line: $!";

Diff Legend

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