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.331 by root, Mon Aug 13 13:10:01 2007 UTC vs.
Revision 1.412 by root, Wed Apr 2 11:13:55 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 1.86;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro 4.32 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
46use Coro::Util ();
24 47
25use JSON::XS 1.4 (); 48use JSON::XS 2.01 ();
26use BDB (); 49use BDB ();
27use Data::Dumper; 50use Data::Dumper;
28use Digest::MD5; 51use Digest::MD5;
29use Fcntl; 52use Fcntl;
30use YAML::Syck (); 53use YAML ();
31use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
32use Time::HiRes; 55use Time::HiRes;
33use Compress::LZF; 56use Compress::LZF;
34use Digest::MD5 (); 57use Digest::MD5 ();
35 58
36# configure various modules to our taste 59# configure various modules to our taste
37# 60#
38$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::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 63Compress::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 64
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 66
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 68
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
74 93
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 97our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
82 99
83our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 104our $DB_ENV;
85 105
86our %CFG; 106our %CFG;
87 107
88our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 109our $RUNTIME;
110our $NOW;
90 111
91our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
94 115
95# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 118
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
101 123
102binmode STDOUT; 124binmode STDOUT;
103binmode STDERR; 125binmode STDERR;
104 126
105# read virtual server time, if available 127# read virtual server time, if available
158 180
159The raw value load value from the last tick. 181The raw value load value from the last tick.
160 182
161=item %cf::CFG 183=item %cf::CFG
162 184
163Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 186from wherever your confdir points to.
165 187
166=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
167 189
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
186 $msg .= "\n" 208 $msg .= "\n"
187 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
188 210
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 212
191 utf8::encode $msg;
192 LOG llevError, $msg; 213 LOG llevError, $msg;
193 }; 214 };
194} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
195 231
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
212)) { 248)) {
213 no strict 'refs'; 249 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 251}
216 252
217$Event::DIED = sub { 253$EV::DIED = sub {
218 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
219}; 255};
220 256
221############################################################################# 257#############################################################################
222 258
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 282 $d
247 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
248} 284}
249 285
250=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
251 287
252Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
253 289
254=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
255 291
256Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
257 293
258=cut 294=cut
259 295
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 297
262sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
264 300
265=item cf::lock_wait $string 301=item cf::lock_wait $string
266 302
267Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
268 304
271Wait until the given lock is available and then acquires it and returns 307Wait 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, 308a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
274returned. 310returned.
275 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
276Lock names should begin with a unique identifier (for example, cf::map::find 315Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
278 317
279=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
280 319
281Return true if the lock is currently active, i.e. somebody has locked it. 320Return true if the lock is currently active, i.e. somebody has locked it.
282 321
283=cut 322=cut
284 323
285our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
286 326
287sub lock_wait($) { 327sub lock_wait($) {
288 my ($key) = @_; 328 my ($key) = @_;
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
289 334
290 # wait for lock, if any 335 # wait for lock, if any
291 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 338 Coro::schedule;
299 344
300 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
301 lock_wait $key; 346 lock_wait $key;
302 347
303 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
304 350
305 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
308 } 355 }
309} 356}
310 357
313 360
314 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
315} 362}
316 363
317sub freeze_mainloop { 364sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
319 366
320 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
321 $TICK_WATCHER->start; 368}
322 }; 369
323 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
324 $guard 371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
325} 383}
326 384
327=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
328 386
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
340our @SLOT_QUEUE; 398our @SLOT_QUEUE;
341our $SLOT_QUEUE; 399our $SLOT_QUEUE;
342 400
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
345 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
346 406
347 while () { 407 while () {
348 next_job: 408 next_job:
349 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
357 } 417 }
358 } 418 }
359 } 419 }
360 420
361 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 424 $signal->wait;
365 } else { 425 } else {
366 Coro::schedule; 426 Coro::schedule;
367 } 427 }
390 450
391BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
392 452
393=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
394 454
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 456is 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 457partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 458acceptable.
399 459
400If it must be done, put the blocking parts into C<sync_job>. This will run 460If 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 461the given BLOCK in another coroutine while waiting for the result. The
406 466
407sub sync_job(&) { 467sub sync_job(&) {
408 my ($job) = @_; 468 my ($job) = @_;
409 469
410 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 471 my $time = EV::time;
412 472
413 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
415 475
416 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 477
418 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
419 479
420 my $busy = 1; 480 my $busy = 1;
421 my @res; 481 my @res;
422 482
423 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 485 @res = eval { $job->() };
425 warn $@ if $@; 486 warn $@ if $@;
426 undef $busy; 487 undef $busy;
427 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
428 489
429 while ($busy) { 490 while ($busy) {
430 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
431 } 495 }
496 }
432 497
433 $time = Event::time - $time; 498 my $time = EV::time - $time;
434 499
435 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437
438 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
439 501
440 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
441 } else { 503 } else {
442 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
443 505
468=item fork_call { }, $args 530=item fork_call { }, $args
469 531
470Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
474 536
475=cut 537=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 538
486sub fork_call(&@) { 539sub fork_call(&@) {
487 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
488 541
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 542 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 543 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 544 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 545
494 if (my $pid = fork) { 546 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; 547 reset_signals;
508 local $SIG{__WARN__}; 548 &$cb
509 local $SIG{__DIE__}; 549 }, @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 550
516 eval { 551 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} 552}
529 553
530=item $value = cf::db_get $family => $key 554=item $value = cf::db_get $family => $key
531 555
532Returns a single value from the environment database. 556Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 558=item cf::db_put $family => $key => $value
535 559
536Stores the given C<$value> in the family. It can currently store binary 560Stores 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). 561data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 562
563=item $db = cf::db_table "name"
564
565Create and/or open a new database table. The string must not be "db" and must be unique
566within each server.
567
539=cut 568=cut
569
570sub db_table($) {
571 my ($name) = @_;
572 my $db = BDB::db_create $DB_ENV;
573
574 eval {
575 $db->set_flags (BDB::CHKSUM);
576
577 utf8::encode $name;
578 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
579 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
580 cf::cleanup "db_open(db): $!" if $!;
581 };
582 cf::cleanup "db_open(db): $@" if $@;
583
584 $db
585}
540 586
541our $DB; 587our $DB;
542 588
543sub db_init { 589sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 590 cf::sync_job {
548 eval { 591 $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 } 592 };
558} 593}
559 594
560sub db_get($$) { 595sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 596 my $key = "$_[0]/$_[1]";
562 597
612 if (1) { 647 if (1) {
613 $md5 = 648 $md5 =
614 join "\x00", 649 join "\x00",
615 $processversion, 650 $processversion,
616 map { 651 map {
617 Coro::cede; 652 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 653 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 654 } 0.. $#$src;
620 655
621 656
622 my $dbmd5 = db_get cache => "$id/md5"; 657 my $dbmd5 = db_get cache => "$id/md5";
666attach callbacks/event handlers (a collection of which is called an "attachment") 701attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 702to it. All such attachable objects support the following methods.
668 703
669In the following description, CLASS can be any of C<global>, C<object> 704In 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 705C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 706Deliantra).
672 707
673=over 4 708=over 4
674 709
675=item $attachable->attach ($attachment, key => $value...) 710=item $attachable->attach ($attachment, key => $value...)
676 711
958 } 993 }
959 994
960 0 995 0
961} 996}
962 997
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 998=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 999
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1000=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1001
967Generate an object-specific event with the given arguments. 1002Generate an object-specific event with the given arguments.
968 1003
974 1009
975=cut 1010=cut
976 1011
977############################################################################# 1012#############################################################################
978# object support 1013# object support
979#
980 1014
1015sub _object_equal($$);
1016sub _object_equal($$) {
1017 my ($a, $b) = @_;
1018
1019 return 0 unless (ref $a) eq (ref $b);
1020
1021 if ("HASH" eq ref $a) {
1022 my @ka = keys %$a;
1023 my @kb = keys %$b;
1024
1025 return 0 if @ka != @kb;
1026
1027 for (0 .. $#ka) {
1028 return 0 unless $ka[$_] eq $kb[$_];
1029 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1030 }
1031
1032 } elsif ("ARRAY" eq ref $a) {
1033
1034 return 0 if @$a != @$b;
1035
1036 for (0 .. $#$a) {
1037 return 0 unless _object_equal $a->[$_], $b->[$_];
1038 }
1039
1040 } elsif ($a ne $b) {
1041 return 0;
1042 }
1043
1044 1
1045}
1046
1047our $SLOW_MERGES;#d#
981sub _can_merge { 1048sub _can_merge {
982 my ($ob1, $ob2) = @_; 1049 my ($ob1, $ob2) = @_;
983 1050
984 local $Storable::canonical = 1; 1051 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1052
988 $fob1 eq $fob2 1053 # we do the slow way here
1054 return _object_equal $ob1, $ob2
989} 1055}
990 1056
991sub reattach { 1057sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1058 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1059 my ($obj) = @_;
1015cf::attachable->attach ( 1081cf::attachable->attach (
1016 prio => -1000000, 1082 prio => -1000000,
1017 on_instantiate => sub { 1083 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1084 my ($obj, $data) = @_;
1019 1085
1020 $data = from_json $data; 1086 $data = decode_json $data;
1021 1087
1022 for (@$data) { 1088 for (@$data) {
1023 my ($name, $args) = @$_; 1089 my ($name, $args) = @$_;
1024 1090
1025 $obj->attach ($name, %{$args || {} }); 1091 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1107sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1108 my ($filename, $rdata, $objs) = @_;
1043 1109
1044 sync_job { 1110 sync_job {
1045 if (length $$rdata) { 1111 if (length $$rdata) {
1112 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1113 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1114 $decname, length $$rdata, scalar @$objs;
1048 1115
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1117 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1119 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1120 close $fh;
1054 1121
1055 if (@$objs) { 1122 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1124 chmod SAVE_MODE, $fh;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1126 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1127 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1128 close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1129 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1130 }
1071 } 1138 }
1072 } else { 1139 } else {
1073 aio_unlink $filename; 1140 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1141 aio_unlink "$filename.pst";
1075 } 1142 }
1076 } 1143 };
1077} 1144}
1078 1145
1079sub object_freezer_as_string { 1146sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1147 my ($rdata, $objs) = @_;
1081 1148
1093 or return; 1160 or return;
1094 1161
1095 unless (aio_stat "$filename.pst") { 1162 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1163 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1164 or return;
1165
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1166 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs};
1099 } 1168 }
1100 1169
1170 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1171 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1172 $decname, length $data, scalar @{$av || []};
1173
1103 return ($data, $av); 1174 ($data, $av)
1104} 1175}
1105 1176
1106=head2 COMMAND CALLBACKS 1177=head2 COMMAND CALLBACKS
1107 1178
1108=over 4 1179=over 4
1186 my ($type, $reply, @payload) = 1257 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1258 "ARRAY" eq ref $msg
1188 ? @$msg 1259 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1260 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1261
1262 my @reply;
1263
1191 if (my $cb = $EXTCMD{$type}) { 1264 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1265 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1266 }
1267
1268 $pl->ext_reply ($reply, @reply)
1269 if $reply;
1270
1197 } else { 1271 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1272 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1273 }
1200 1274
1201 cf::override; 1275 cf::override;
1254 my $msg = $@ ? "$v->{path}: $@\n" 1328 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1329 : "$v->{base}: extension inactive.\n";
1256 1330
1257 if (exists $v->{meta}{mandatory}) { 1331 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1332 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1333 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1334 }
1262 1335
1263 warn $msg; 1336 warn $msg;
1264 } 1337 }
1265 1338
1290use Coro::AIO; 1363use Coro::AIO;
1291 1364
1292=head3 cf::player 1365=head3 cf::player
1293 1366
1294=over 4 1367=over 4
1368
1369=item cf::player::num_playing
1370
1371Returns the official number of playing players, as per the Crossfire metaserver rules.
1372
1373=cut
1374
1375sub num_playing {
1376 scalar grep
1377 $_->ob->map
1378 && !$_->hidden
1379 && !$_->ob->flag (cf::FLAG_WIZ),
1380 cf::player::list
1381}
1295 1382
1296=item cf::player::find $login 1383=item cf::player::find $login
1297 1384
1298Returns the given player object, loading it if necessary (might block). 1385Returns the given player object, loading it if necessary (might block).
1299 1386
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1422 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1423 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1424 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1425 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1426
1340 my $pl = load_pl path $login 1427 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1428 or return;
1429
1430 my $pl = cf::player::load_pl $f
1431 or return;
1432 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1434 $cf::PLAYER{$login} = $pl
1343 } 1435 }
1344 } 1436 }
1345} 1437}
1346 1438
1356 1448
1357 aio_mkdir playerdir $pl, 0770; 1449 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1450 $pl->{last_save} = $cf::RUNTIME;
1359 1451
1360 $pl->save_pl ($path); 1452 $pl->save_pl ($path);
1361 Coro::cede; 1453 cf::cede_to_tick;
1362} 1454}
1363 1455
1364sub new($) { 1456sub new($) {
1365 my ($login) = @_; 1457 my ($login) = @_;
1366 1458
1444 or return []; 1536 or return [];
1445 1537
1446 my @logins; 1538 my @logins;
1447 1539
1448 for my $login (@$dirs) { 1540 for my $login (@$dirs) {
1541 my $path = path $login;
1542
1543 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") {
1449 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450 aio_read $fh, 0, 512, my $buf, 0 or next; 1546 aio_read $fh, 0, 512, my $buf, 0 or next;
1451 $buf !~ /^password -------------$/m or next; # official not-valid tag 1547 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 }
1452 1549
1453 utf8::decode $login; 1550 utf8::decode $login;
1454 push @logins, $login; 1551 push @logins, $login;
1455 } 1552 }
1456 1553
1489 1586
1490Expand crossfire pod fragments into protocol xml. 1587Expand crossfire pod fragments into protocol xml.
1491 1588
1492=cut 1589=cut
1493 1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1494sub expand_cfpod { 1602sub expand_cfpod {
1495 ((my $self), (local $_)) = @_; 1603 my ($self, $pod) = @_;
1496 1604
1497 # escape & and < 1605 my $xml;
1498 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g;
1500 1606
1501 # this is buggy, it needs to properly take care of nested <'s 1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1502 1610
1503 1 while 1611 $group =~ s/&/&amp;/g;
1504 # replace B<>, I<>, U<> etc. 1612 $group =~ s/</&lt;/g;
1505 s/B<([^\>]*)>/<b>$1<\/b>/ 1613
1506 || s/I<([^\>]*)>/<i>$1<\/i>/ 1614 $xml .= $group;
1507 || s/U<([^\>]*)>/<u>$1<\/u>/ 1615 } elsif ($pod =~ m%\G
1508 # replace G<male|female> tags 1616 ([BCGHITU])
1509 || s{G<([^>|]*)\|([^>]*)>}{ 1617 <
1510 $self->gender ? $2 : $1 1618 (?:
1511 }ge 1619 ([^<>]*) (?{ $group = $^N })
1512 # replace H<hint text> 1620 | < $interior >
1513 || s{H<([^\>]*)>} 1621 )
1622 >
1623 %gcsx
1514 { 1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1515 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1516 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1517 "") 1644 "")
1518 [$self->{hintmode}] 1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1519 }ge; 1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1520 1656
1657 for ($xml) {
1521 # create single paragraphs (very hackish) 1658 # create single paragraphs (very hackish)
1522 s/(?<=\S)\n(?=\w)/ /g; 1659 s/(?<=\S)\n(?=\w)/ /g;
1523 1660
1524 # compress some whitespace 1661 # compress some whitespace
1525 s/\s+\n/\n/g; # ws line-ends 1662 s/\s+\n/\n/g; # ws line-ends
1526 s/\n\n+/\n/g; # double lines 1663 s/\n\n+/\n/g; # double lines
1527 s/^\n+//; # beginning lines 1664 s/^\n+//; # beginning lines
1528 s/\n+$//; # ending lines 1665 s/\n+$//; # ending lines
1666 }
1529 1667
1530 $_ 1668 $xml
1531} 1669}
1670
1671no re 'eval';
1532 1672
1533sub hintmode { 1673sub hintmode {
1534 $_[0]{hintmode} = $_[1] if @_ > 1; 1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1535 $_[0]{hintmode} 1675 $_[0]{hintmode}
1536} 1676}
1542=cut 1682=cut
1543 1683
1544sub ext_reply($$@) { 1684sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1685 my ($self, $id, @msg) = @_;
1546 1686
1547 if ($self->ns->extcmd == 2) { 1687 $self->ns->ext_reply ($id, @msg)
1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1554} 1688}
1555 1689
1556=item $player->ext_msg ($type, @msg) 1690=item $player->ext_msg ($type, @msg)
1557 1691
1558Sends an ext event to the client. 1692Sends an ext event to the client.
1786 1920
1787sub load_header_from($) { 1921sub load_header_from($) {
1788 my ($self, $path) = @_; 1922 my ($self, $path) = @_;
1789 1923
1790 utf8::encode $path; 1924 utf8::encode $path;
1791 #aio_open $path, O_RDONLY, 0 1925 my $f = new_from_file cf::object::thawer $path
1792 # or return;
1793
1794 $self->_load_header ($path)
1795 or return; 1926 or return;
1927
1928 $self->_load_header ($f)
1929 or return;
1930
1931 local $MAP_LOADING{$self->{path}} = $self;
1932 $f->resolve_delayed_derefs;
1796 1933
1797 $self->{load_path} = $path; 1934 $self->{load_path} = $path;
1798 1935
1799 1 1936 1
1800} 1937}
1854sub find { 1991sub find {
1855 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
1856 1993
1857 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
1858 1995
1996 cf::lock_wait "map_data:$path";#d#remove
1859 cf::lock_wait "map_find:$path"; 1997 cf::lock_wait "map_find:$path";
1860 1998
1861 $cf::MAP{$path} || do { 1999 $cf::MAP{$path} || do {
1862 my $guard = cf::lock_acquire "map_find:$path"; 2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
1863 my $map = new_from_path cf::map $path 2003 my $map = new_from_path cf::map $path
1864 or return; 2004 or return;
1865 2005
1866 $map->{last_save} = $cf::RUNTIME; 2006 $map->{last_save} = $cf::RUNTIME;
1867 2007
1869 or return; 2009 or return;
1870 2010
1871 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1872 # doing this can freeze the server in a sync job, obviously 2012 # doing this can freeze the server in a sync job, obviously
1873 #$cf::WAIT_FOR_TICK->wait; 2013 #$cf::WAIT_FOR_TICK->wait;
2014 undef $guard1;
2015 undef $guard2;
1874 $map->reset; 2016 $map->reset;
1875 undef $guard;
1876 return find $path; 2017 return find $path;
1877 } 2018 }
1878 2019
1879 $cf::MAP{$path} = $map 2020 $cf::MAP{$path} = $map
1880 } 2021 }
1889 local $self->{deny_reset} = 1; # loading can take a long time 2030 local $self->{deny_reset} = 1; # loading can take a long time
1890 2031
1891 my $path = $self->{path}; 2032 my $path = $self->{path};
1892 2033
1893 { 2034 {
1894 my $guard = cf::lock_acquire "map_load:$path"; 2035 my $guard = cf::lock_acquire "map_data:$path";
1895 2036
2037 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 2038 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 2039
1898 $self->in_memory (cf::MAP_LOADING); 2040 $self->in_memory (cf::MAP_LOADING);
1899 2041
1900 $self->alloc; 2042 $self->alloc;
1901 2043
1902 $self->pre_load; 2044 $self->pre_load;
1903 Coro::cede; 2045 cf::cede_to_tick;
1904 2046
2047 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block;
1905 $self->_load_objects ($self->{load_path}, 1) 2049 $self->_load_objects ($f)
1906 or return; 2050 or return;
1907 2051
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1909 if delete $self->{load_original}; 2053 if delete $self->{load_original};
1910 2054
1911 if (my $uniq = $self->uniq_path) { 2055 if (my $uniq = $self->uniq_path) {
1912 utf8::encode $uniq; 2056 utf8::encode $uniq;
1913 if (aio_open $uniq, O_RDONLY, 0) { 2057 unless (aio_stat $uniq) {
2058 if (my $f = new_from_file cf::object::thawer $uniq) {
1914 $self->clear_unique_items; 2059 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 2060 $self->_load_objects ($f);
2061 $f->resolve_delayed_derefs;
2062 }
1916 } 2063 }
1917 } 2064 }
1918 2065
1919 Coro::cede; 2066 $f->resolve_delayed_derefs;
2067
2068 cf::cede_to_tick;
1920 # now do the right thing for maps 2069 # now do the right thing for maps
1921 $self->link_multipart_objects; 2070 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 2071 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 2072 unless $self->difficulty;
1924 Coro::cede; 2073 cf::cede_to_tick;
1925 2074
1926 unless ($self->{deny_activate}) { 2075 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 2076 $self->decay_objects;
1928 $self->fix_auto_apply; 2077 $self->fix_auto_apply;
1929 $self->update_buttons; 2078 $self->update_buttons;
1930 Coro::cede; 2079 cf::cede_to_tick;
1931 $self->set_darkness_map; 2080 $self->set_darkness_map;
1932 Coro::cede; 2081 cf::cede_to_tick;
1933 $self->activate; 2082 $self->activate;
1934 } 2083 }
1935 2084
1936 $self->{last_save} = $cf::RUNTIME; 2085 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 2086 $self->last_access ($cf::RUNTIME);
1953 2102
1954 $self 2103 $self
1955} 2104}
1956 2105
1957# find and load all maps in the 3x3 area around a map 2106# find and load all maps in the 3x3 area around a map
1958sub load_diag { 2107sub load_neighbours {
1959 my ($map) = @_; 2108 my ($map) = @_;
1960 2109
1961 my @diag; # diagonal neighbours 2110 my @neigh; # diagonal neighbours
1962 2111
1963 for (0 .. 3) { 2112 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 2113 my $neigh = $map->tile_path ($_)
1965 or next; 2114 or next;
1966 $neigh = find $neigh, $map 2115 $neigh = find $neigh, $map
1967 or next; 2116 or next;
1968 $neigh->load; 2117 $neigh->load;
1969 2118
2119 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2120 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2121 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 2122 }
1973 2123
1974 for (@diag) { 2124 for (grep defined $_->[0], @neigh) {
2125 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 2126 my $neigh = find $path, $origin
1976 or next; 2127 or next;
1977 $neigh->load; 2128 $neigh->load;
1978 } 2129 }
1979} 2130}
1980 2131
1985} 2136}
1986 2137
1987sub do_load_sync { 2138sub do_load_sync {
1988 my ($map) = @_; 2139 my ($map) = @_;
1989 2140
2141 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2142 if $Coro::current == $Coro::main;
2143
1990 cf::sync_job { $map->load }; 2144 cf::sync_job { $map->load };
1991} 2145}
1992 2146
1993our %MAP_PREFETCH; 2147our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 2148our $MAP_PREFETCHER = undef;
1995 2149
1996sub find_async { 2150sub find_async {
1997 my ($path, $origin) = @_; 2151 my ($path, $origin, $load) = @_;
1998 2152
1999 $path = normalise $path, $origin && $origin->{path}; 2153 $path = normalise $path, $origin && $origin->{path};
2000 2154
2001 if (my $map = $cf::MAP{$path}) { 2155 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2003 } 2157 }
2004 2158
2005 undef $MAP_PREFETCH{$path}; 2159 $MAP_PREFETCH{$path} |= $load;
2160
2006 $MAP_PREFETCHER ||= cf::async { 2161 $MAP_PREFETCHER ||= cf::async {
2162 $Coro::current->{desc} = "map prefetcher";
2163
2007 while (%MAP_PREFETCH) { 2164 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 2165 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 2166 if (my $map = find $k) {
2010 $map->load; 2167 $map->load if $v;
2011 } 2168 }
2012 2169
2013 delete $MAP_PREFETCH{$path}; 2170 delete $MAP_PREFETCH{$k};
2014 } 2171 }
2015 } 2172 }
2016 undef $MAP_PREFETCHER; 2173 undef $MAP_PREFETCHER;
2017 }; 2174 };
2018 $MAP_PREFETCHER->prio (6); 2175 $MAP_PREFETCHER->prio (6);
2021} 2178}
2022 2179
2023sub save { 2180sub save {
2024 my ($self) = @_; 2181 my ($self) = @_;
2025 2182
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 2184
2028 $self->{last_save} = $cf::RUNTIME; 2185 $self->{last_save} = $cf::RUNTIME;
2029 2186
2030 return unless $self->dirty; 2187 return unless $self->dirty;
2031 2188
2037 return if $self->{deny_save}; 2194 return if $self->{deny_save};
2038 2195
2039 local $self->{last_access} = $self->last_access;#d# 2196 local $self->{last_access} = $self->last_access;#d#
2040 2197
2041 cf::async { 2198 cf::async {
2199 $Coro::current->{desc} = "map player save";
2042 $_->contr->save for $self->players; 2200 $_->contr->save for $self->players;
2043 }; 2201 };
2044 2202
2045 if ($uniq) { 2203 if ($uniq) {
2046 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2054 my ($self) = @_; 2212 my ($self) = @_;
2055 2213
2056 # save first because save cedes 2214 # save first because save cedes
2057 $self->save; 2215 $self->save;
2058 2216
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2218
2061 return if $self->players; 2219 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2220 return if $self->in_memory != cf::MAP_IN_MEMORY;
2063 return if $self->{deny_save}; 2221 return if $self->{deny_save};
2064 2222
2223 $self->in_memory (cf::MAP_SWAPPED);
2224
2225 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP;
2065 $self->clear; 2227 $self->clear;
2066 $self->in_memory (cf::MAP_SWAPPED);
2067} 2228}
2068 2229
2069sub reset_at { 2230sub reset_at {
2070 my ($self) = @_; 2231 my ($self) = @_;
2071 2232
2103 if $uniq; 2264 if $uniq;
2104 } 2265 }
2105 2266
2106 delete $cf::MAP{$self->path}; 2267 delete $cf::MAP{$self->path};
2107 2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
2108 $self->clear; 2271 $self->clear;
2109
2110 $_->clear_links_to ($self) for values %cf::MAP;
2111 2272
2112 $self->unlink_save; 2273 $self->unlink_save;
2113 $self->destroy; 2274 $self->destroy;
2114} 2275}
2115 2276
2116my $nuke_counter = "aaaa"; 2277my $nuke_counter = "aaaa";
2117 2278
2118sub nuke { 2279sub nuke {
2119 my ($self) = @_; 2280 my ($self) = @_;
2120 2281
2282 {
2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2284
2121 delete $cf::MAP{$self->path}; 2285 delete $cf::MAP{$self->path};
2122 2286
2123 $self->unlink_save; 2287 $self->unlink_save;
2124 2288
2125 bless $self, "cf::map"; 2289 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2290 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2291 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2292 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2293 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2294
2131 $cf::MAP{$self->path} = $self; 2295 $cf::MAP{$self->path} = $self;
2296 }
2132 2297
2133 $self->reset; # polite request, might not happen 2298 $self->reset; # polite request, might not happen
2134} 2299}
2135 2300
2136=item $maps = cf::map::tmp_maps 2301=item $maps = cf::map::tmp_maps
2212 2377
2213sub inv_recursive { 2378sub inv_recursive {
2214 inv_recursive_ inv $_[0] 2379 inv_recursive_ inv $_[0]
2215} 2380}
2216 2381
2382=item $ref = $ob->ref
2383
2384creates and returns a persistent reference to an objetc that can be stored as a string.
2385
2386=item $ob = cf::object::deref ($refstring)
2387
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block.
2390
2391=cut
2392
2393sub deref {
2394 my ($ref) = @_;
2395
2396 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2397 my ($uuid, $name) = ($1, $2);
2398 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2399 or return;
2400 $pl->ob->uuid eq $uuid
2401 or return;
2402
2403 $pl->ob
2404 } else {
2405 warn "$ref: cannot resolve object reference\n";
2406 undef
2407 }
2408}
2409
2217package cf; 2410package cf;
2218 2411
2219=back 2412=back
2220 2413
2221=head3 cf::object::player 2414=head3 cf::object::player
2349 # use -1 or undef as default coordinates, not 0, 0 2542 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2543 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2544 if $x <=0 && $y <= 0;
2352 2545
2353 $map->load; 2546 $map->load;
2354 $map->load_diag; 2547 $map->load_neighbours;
2355 2548
2356 return unless $self->contr->active; 2549 return unless $self->contr->active;
2357 $self->activate_recursive; 2550 $self->activate_recursive;
2358 2551
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2380 2573
2381 $self->enter_link; 2574 $self->enter_link;
2382 2575
2383 (async { 2576 (async {
2577 $Coro::current->{desc} = "player::goto $path $x $y";
2578
2579 # *tag paths override both path and x|y
2580 if ($path =~ /^\*(.*)$/) {
2581 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2582 my $ob = $obs[rand @obs];
2583
2584 # see if we actually can go there
2585 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2586 $ob = $obs[rand @obs];
2587 } else {
2588 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 }
2590 # else put us there anyways for now #d#
2591
2592 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2593 } else {
2594 ($path, $x, $y) = (undef, undef, undef);
2595 }
2596 }
2597
2384 my $map = eval { 2598 my $map = eval {
2385 my $map = cf::map::find $path; 2599 my $map = defined $path ? cf::map::find $path : undef;
2386 2600
2387 if ($map) { 2601 if ($map) {
2388 $map = $map->customise_for ($self); 2602 $map = $map->customise_for ($self);
2389 $map = $check->($map) if $check && $map; 2603 $map = $check->($map) if $check && $map;
2390 } else { 2604 } else {
2391 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2605 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2392 } 2606 }
2393 2607
2394 $map 2608 $map
2395 }; 2609 };
2396 2610
2449 $rmp->{origin_y} = $exit->y; 2663 $rmp->{origin_y} = $exit->y;
2450 } 2664 }
2451 2665
2452 $rmp->{random_seed} ||= $exit->random_seed; 2666 $rmp->{random_seed} ||= $exit->random_seed;
2453 2667
2454 my $data = cf::to_json $rmp; 2668 my $data = cf::encode_json $rmp;
2455 my $md5 = Digest::MD5::md5_hex $data; 2669 my $md5 = Digest::MD5::md5_hex $data;
2456 my $meta = "$RANDOMDIR/$md5.meta"; 2670 my $meta = "$RANDOMDIR/$md5.meta";
2457 2671
2458 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2459 aio_write $fh, 0, (length $data), $data, 0; 2673 aio_write $fh, 0, (length $data), $data, 0;
2486 # if exit is damned, update players death & WoR home-position 2700 # if exit is damned, update players death & WoR home-position
2487 $self->contr->savebed ($slaying, $hp, $sp) 2701 $self->contr->savebed ($slaying, $hp, $sp)
2488 if $exit->flag (FLAG_DAMNED); 2702 if $exit->flag (FLAG_DAMNED);
2489 2703
2490 (async { 2704 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2706
2491 $self->deactivate_recursive; # just to be sure 2707 $self->deactivate_recursive; # just to be sure
2492 unless (eval { 2708 unless (eval {
2493 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($slaying, $hp, $sp);
2494 2710
2495 1; 2711 1;
2530the message, with C<log> being the default. If C<$color> is negative, suppress 2746the message, with C<log> being the default. If C<$color> is negative, suppress
2531the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2532 2748
2533=cut 2749=cut
2534 2750
2751# non-persistent channels (usually the info channel)
2752our %CHANNEL = (
2753 "c/identify" => {
2754 id => "infobox",
2755 title => "Identify",
2756 reply => undef,
2757 tooltip => "Items recently identified",
2758 },
2759 "c/examine" => {
2760 id => "infobox",
2761 title => "Examine",
2762 reply => undef,
2763 tooltip => "Signs and other items you examined",
2764 },
2765 "c/book" => {
2766 id => "infobox",
2767 title => "Book",
2768 reply => undef,
2769 tooltip => "The contents of a note or book",
2770 },
2771 "c/lookat" => {
2772 id => "infobox",
2773 title => "Look",
2774 reply => undef,
2775 tooltip => "What you saw there",
2776 },
2777 "c/who" => {
2778 id => "infobox",
2779 title => "Players",
2780 reply => undef,
2781 tooltip => "Shows players who are currently online",
2782 },
2783 "c/body" => {
2784 id => "infobox",
2785 title => "Body Parts",
2786 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available",
2788 },
2789 "c/uptime" => {
2790 id => "infobox",
2791 title => "Uptime",
2792 reply => undef,
2793 tooltip => "How long the server has been running since last restart",
2794 },
2795 "c/mapinfo" => {
2796 id => "infobox",
2797 title => "Map Info",
2798 reply => undef,
2799 tooltip => "Information related to the maps",
2800 },
2801);
2802
2535sub cf::client::send_msg { 2803sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2805
2538 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg);
2539 2807
2540 $color &= cf::NDI_CLIENT_MASK; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2541 2809
2810 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel};
2813
2814 $self->ext_msg (channel_info => $channel)
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id};
2818
2542 if (ref $channel) { 2819 } elsif (ref $channel) {
2543 # send meta info to client, if not yet sent 2820 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2821 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2822 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2823 $self->ext_msg (channel_info => $channel)
2824 if $self->can_msg;
2547 } 2825 }
2548 2826
2549 $channel = $channel->{id}; 2827 $channel = $channel->{id};
2550 } 2828 }
2551 2829
2592=cut 2870=cut
2593 2871
2594sub cf::client::ext_msg($$@) { 2872sub cf::client::ext_msg($$@) {
2595 my ($self, $type, @msg) = @_; 2873 my ($self, $type, @msg) = @_;
2596 2874
2597 my $extcmd = $self->extcmd;
2598
2599 if ($extcmd == 2) { 2875 if ($self->extcmd == 2) {
2600 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2601 } elsif ($extcmd == 1) { # TODO: remove 2877 } elsif ($self->extcmd == 1) { # TODO: remove
2602 push @msg, msgtype => "event_$type"; 2878 push @msg, msgtype => "event_$type";
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 }
2881}
2882
2883=item $client->ext_reply ($msgid, @msg)
2884
2885Sends an ext reply to the client.
2886
2887=cut
2888
2889sub cf::client::ext_reply($$@) {
2890 my ($self, $id, @msg) = @_;
2891
2892 if ($self->extcmd == 2) {
2893 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2894 } elsif ($self->extcmd == 1) {
2895 #TODO: version 1, remove
2896 unshift @msg, msgtype => "reply", msgid => $id;
2603 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2897 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2604 } 2898 }
2605} 2899}
2606 2900
2607=item $success = $client->query ($flags, "text", \&cb) 2901=item $success = $client->query ($flags, "text", \&cb)
2669 my ($type, $reply, @payload) = 2963 my ($type, $reply, @payload) =
2670 "ARRAY" eq ref $msg 2964 "ARRAY" eq ref $msg
2671 ? @$msg 2965 ? @$msg
2672 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2966 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2673 2967
2968 my @reply;
2969
2674 if (my $cb = $EXTICMD{$type}) { 2970 if (my $cb = $EXTICMD{$type}) {
2675 my @reply = $cb->($ns, @payload); 2971 @reply = $cb->($ns, @payload);
2676
2677 $ns->ext_reply ($reply, @reply)
2678 if $reply;
2679 } 2972 }
2973
2974 $ns->ext_reply ($reply, @reply)
2975 if $reply;
2976
2680 } else { 2977 } else {
2681 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2978 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2682 } 2979 }
2683 2980
2684 cf::override; 2981 cf::override;
2744=pod 3041=pod
2745 3042
2746The following functions and methods are available within a safe environment: 3043The following functions and methods are available within a safe environment:
2747 3044
2748 cf::object 3045 cf::object
2749 contr pay_amount pay_player map x y force_find force_add 3046 contr pay_amount pay_player map x y force_find force_add destroy
2750 insert remove name archname title slaying race 3047 insert remove name archname title slaying race decrease_ob_nr
2751 3048
2752 cf::object::player 3049 cf::object::player
2753 player 3050 player
2754 3051
2755 cf::player 3052 cf::player
2760 3057
2761=cut 3058=cut
2762 3059
2763for ( 3060for (
2764 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2765 insert remove inv name archname title slaying race)], 3062 insert remove inv name archname title slaying race
3063 decrease_ob_nr destroy)],
2766 ["cf::object::player" => qw(player)], 3064 ["cf::object::player" => qw(player)],
2767 ["cf::player" => qw(peaceful)], 3065 ["cf::player" => qw(peaceful)],
2768 ["cf::map" => qw(trigger)], 3066 ["cf::map" => qw(trigger)],
2769) { 3067) {
2770 no strict 'refs'; 3068 no strict 'refs';
2846# the server's init and main functions 3144# the server's init and main functions
2847 3145
2848sub load_facedata($) { 3146sub load_facedata($) {
2849 my ($path) = @_; 3147 my ($path) = @_;
2850 3148
3149 # HACK to clear player env face cache, we need some signal framework
3150 # for this (global event?)
3151 %ext::player_env::MUSIC_FACE_CACHE = ();
3152
3153 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3154
2851 warn "loading facedata from $path\n"; 3155 warn "loading facedata from $path\n";
2852 3156
2853 my $facedata; 3157 my $facedata;
2854 0 < aio_load $path, $facedata 3158 0 < aio_load $path, $facedata
2855 or die "$path: $!"; 3159 or die "$path: $!";
2857 $facedata = Coro::Storable::thaw $facedata; 3161 $facedata = Coro::Storable::thaw $facedata;
2858 3162
2859 $facedata->{version} == 2 3163 $facedata->{version} == 2
2860 or cf::cleanup "$path: version mismatch, cannot proceed."; 3164 or cf::cleanup "$path: version mismatch, cannot proceed.";
2861 3165
3166 # patch in the exptable
3167 $facedata->{resource}{"res/exp_table"} = {
3168 type => FT_RSRC,
3169 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3170 };
3171 cf::cede_to_tick;
3172
2862 { 3173 {
2863 my $faces = $facedata->{faceinfo}; 3174 my $faces = $facedata->{faceinfo};
2864 3175
2865 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2866 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3177 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178
2867 cf::face::set_visibility $idx, $info->{visibility}; 3179 cf::face::set_visibility $idx, $info->{visibility};
2868 cf::face::set_magicmap $idx, $info->{magicmap}; 3180 cf::face::set_magicmap $idx, $info->{magicmap};
2869 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2870 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2871 3183
2872 cf::cede_to_tick; 3184 cf::cede_to_tick;
2873 } 3185 }
2874 3186
2875 while (my ($face, $info) = each %$faces) { 3187 while (my ($face, $info) = each %$faces) {
2876 next unless $info->{smooth}; 3188 next unless $info->{smooth};
3189
2877 my $idx = cf::face::find $face 3190 my $idx = cf::face::find $face
2878 or next; 3191 or next;
3192
2879 if (my $smooth = cf::face::find $info->{smooth}) { 3193 if (my $smooth = cf::face::find $info->{smooth}) {
2880 cf::face::set_smooth $idx, $smooth; 3194 cf::face::set_smooth $idx, $smooth;
2881 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2882 } else { 3196 } else {
2883 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3197 warn "smooth face '$info->{smooth}' not found for face '$face'";
2900 3214
2901 { 3215 {
2902 # TODO: for gcfclient pleasure, we should give resources 3216 # TODO: for gcfclient pleasure, we should give resources
2903 # that gcfclient doesn't grok a >10000 face index. 3217 # that gcfclient doesn't grok a >10000 face index.
2904 my $res = $facedata->{resource}; 3218 my $res = $facedata->{resource};
2905 my $enc = JSON::XS->new->utf8->canonical;
2906
2907 my $soundconf = delete $res->{"res/sound.conf"};
2908 3219
2909 while (my ($name, $info) = each %$res) { 3220 while (my ($name, $info) = each %$res) {
2910 my $meta = $enc->encode ({ 3221 if (defined $info->{type}) {
2911 name => $name,
2912 %{ $info->{meta} || {} },
2913 });
2914
2915 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3222 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3223 my $data;
2916 3224
2917 if ($info->{type} & 1) { 3225 if ($info->{type} & 1) {
2918 # prepend meta info 3226 # prepend meta info
2919 3227
3228 my $meta = $enc->encode ({
3229 name => $name,
3230 %{ $info->{meta} || {} },
3231 });
3232
2920 my $data = pack "(w/a*)*", $meta, $info->{data}; 3233 $data = pack "(w/a*)*", $meta, $info->{data};
2921 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3234 } else {
3235 $data = $info->{data};
3236 }
2922 3237
2923 cf::face::set_data $idx, 0, $data, $chk; 3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type};
2924 } else { 3240 } else {
2925 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3241 $RESOURCE{$name} = $info;
2926 } 3242 }
2927 3243
2928 cf::face::set_type $idx, $info->{type};
2929
2930 cf::cede_to_tick; 3244 cf::cede_to_tick;
2931 } 3245 }
2932
2933 if ($soundconf) {
2934 $soundconf = $enc->decode (delete $soundconf->{data});
2935
2936 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2937 my $sound = $soundconf->{compat}[$_]
2938 or next;
2939
2940 my $face = cf::face::find "sound/$sound->[1]";
2941 cf::sound::set $sound->[0] => $face;
2942 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2943 }
2944
2945 while (my ($k, $v) = each %{$soundconf->{event}}) {
2946 my $face = cf::face::find "sound/$v";
2947 cf::sound::set $k => $face;
2948 }
2949 }
2950 } 3246 }
3247
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2951 3249
2952 1 3250 1
2953} 3251}
3252
3253cf::global->attach (on_resource_update => sub {
3254 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3255 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3256
3257 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3258 my $sound = $soundconf->{compat}[$_]
3259 or next;
3260
3261 my $face = cf::face::find "sound/$sound->[1]";
3262 cf::sound::set $sound->[0] => $face;
3263 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3264 }
3265
3266 while (my ($k, $v) = each %{$soundconf->{event}}) {
3267 my $face = cf::face::find "sound/$v";
3268 cf::sound::set $k => $face;
3269 }
3270 }
3271});
2954 3272
2955register_exticmd fx_want => sub { 3273register_exticmd fx_want => sub {
2956 my ($ns, $want) = @_; 3274 my ($ns, $want) = @_;
2957 3275
2958 while (my ($k, $v) = each %$want) { 3276 while (my ($k, $v) = each %$want) {
2959 $ns->fx_want ($k, $v); 3277 $ns->fx_want ($k, $v);
2960 } 3278 }
2961}; 3279};
2962 3280
2963sub reload_regions { 3281sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = ();
3285
2964 load_resource_file "$MAPDIR/regions" 3286 load_resource_file "$MAPDIR/regions"
2965 or die "unable to load regions file\n"; 3287 or die "unable to load regions file\n";
2966 3288
2967 for (cf::region::list) { 3289 for (cf::region::list) {
2968 $_->{match} = qr/$_->{match}/ 3290 $_->{match} = qr/$_->{match}/
3004 3326
3005sub init { 3327sub init {
3006 reload_resources; 3328 reload_resources;
3007} 3329}
3008 3330
3009sub cfg_load { 3331sub reload_config {
3010 open my $fh, "<:utf8", "$CONFDIR/config" 3332 open my $fh, "<:utf8", "$CONFDIR/config"
3011 or return; 3333 or return;
3012 3334
3013 local $/; 3335 local $/;
3014 *CFG = YAML::Syck::Load <$fh>; 3336 *CFG = YAML::Load <$fh>;
3015 3337
3016 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3017 3339
3018 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3340 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3019 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3030sub main { 3352sub main {
3031 # we must not ever block the main coroutine 3353 # we must not ever block the main coroutine
3032 local $Coro::idle = sub { 3354 local $Coro::idle = sub {
3033 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3034 (async { 3356 (async {
3035 Event::one_event; 3357 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT;
3036 })->prio (Coro::PRIO_MAX); 3359 })->prio (Coro::PRIO_MAX);
3037 }; 3360 };
3038 3361
3039 cfg_load; 3362 reload_config;
3040 db_init; 3363 db_init;
3041 load_extensions; 3364 load_extensions;
3042 3365
3043 $TICK_WATCHER->start; 3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start;
3044 Event::loop; 3368 EV::loop;
3045} 3369}
3046 3370
3047############################################################################# 3371#############################################################################
3048# initialisation and cleanup 3372# initialisation and cleanup
3049 3373
3050# install some emergency cleanup handlers 3374# install some emergency cleanup handlers
3051BEGIN { 3375BEGIN {
3376 our %SIGWATCHER = ();
3052 for my $signal (qw(INT HUP TERM)) { 3377 for my $signal (qw(INT HUP TERM)) {
3053 Event->signal ( 3378 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3054 reentrant => 0,
3055 data => WF_AUTOCANCEL,
3056 signal => $signal,
3057 prio => 0,
3058 cb => sub {
3059 cf::cleanup "SIG$signal"; 3379 cf::cleanup "SIG$signal";
3060 },
3061 ); 3380 };
3062 } 3381 }
3063} 3382}
3064 3383
3065sub write_runtime { 3384sub write_runtime {
3066 my $runtime = "$LOCALDIR/runtime"; 3385 my $runtime = "$LOCALDIR/runtime";
3111 # and maps saved/destroyed asynchronously. 3430 # and maps saved/destroyed asynchronously.
3112 warn "begin emergency player save\n"; 3431 warn "begin emergency player save\n";
3113 for my $login (keys %cf::PLAYER) { 3432 for my $login (keys %cf::PLAYER) {
3114 my $pl = $cf::PLAYER{$login} or next; 3433 my $pl = $cf::PLAYER{$login} or next;
3115 $pl->valid or next; 3434 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3116 $pl->save; 3436 $pl->save;
3117 } 3437 }
3118 warn "end emergency player save\n"; 3438 warn "end emergency player save\n";
3119 3439
3120 warn "begin emergency map save\n"; 3440 warn "begin emergency map save\n";
3159 warn "syncing database to disk"; 3479 warn "syncing database to disk";
3160 BDB::db_env_txn_checkpoint $DB_ENV; 3480 BDB::db_env_txn_checkpoint $DB_ENV;
3161 3481
3162 # if anything goes wrong in here, we should simply crash as we already saved 3482 # if anything goes wrong in here, we should simply crash as we already saved
3163 3483
3164 warn "cancelling all WF_AUTOCANCEL watchers";
3165 for (Event::all_watchers) {
3166 $_->cancel if $_->data & WF_AUTOCANCEL;
3167 }
3168
3169 warn "flushing outstanding aio requests"; 3484 warn "flushing outstanding aio requests";
3170 for (;;) { 3485 for (;;) {
3171 BDB::flush; 3486 BDB::flush;
3172 IO::AIO::flush; 3487 IO::AIO::flush;
3173 Coro::cede; 3488 Coro::cede_notself;
3174 last unless IO::AIO::nreqs || BDB::nreqs; 3489 last unless IO::AIO::nreqs || BDB::nreqs;
3175 warn "iterate..."; 3490 warn "iterate...";
3176 } 3491 }
3177 3492
3178 ++$RELOAD; 3493 ++$RELOAD;
3237 warn "reloading cf.pm"; 3552 warn "reloading cf.pm";
3238 require cf; 3553 require cf;
3239 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3240 3555
3241 warn "loading config and database again"; 3556 warn "loading config and database again";
3242 cf::cfg_load; 3557 cf::reload_config;
3243 3558
3244 warn "loading extensions"; 3559 warn "loading extensions";
3245 cf::load_extensions; 3560 cf::load_extensions;
3246 3561
3247 warn "reattaching attachments to objects/players"; 3562 warn "reattaching attachments to objects/players";
3254 warn "leaving sync_job"; 3569 warn "leaving sync_job";
3255 3570
3256 1 3571 1
3257 } or do { 3572 } or do {
3258 warn $@; 3573 warn $@;
3259 warn "error while reloading, exiting."; 3574 cf::cleanup "error while reloading, exiting.";
3260 exit 1;
3261 }; 3575 };
3262 3576
3263 warn "reloaded"; 3577 warn "reloaded";
3264}; 3578};
3265 3579
3267 3581
3268sub reload_perl() { 3582sub reload_perl() {
3269 # doing reload synchronously and two reloads happen back-to-back, 3583 # doing reload synchronously and two reloads happen back-to-back,
3270 # coro crashes during coro_state_free->destroy here. 3584 # coro crashes during coro_state_free->destroy here.
3271 3585
3272 $RELOAD_WATCHER ||= Event->timer ( 3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3273 reentrant => 0,
3274 after => 0,
3275 data => WF_AUTOCANCEL,
3276 cb => sub {
3277 do_reload_perl; 3587 do_reload_perl;
3278 undef $RELOAD_WATCHER; 3588 undef $RELOAD_WATCHER;
3279 },
3280 ); 3589 };
3281} 3590}
3282 3591
3283register_command "reload" => sub { 3592register_command "reload" => sub {
3284 my ($who, $arg) = @_; 3593 my ($who, $arg) = @_;
3285 3594
3286 if ($who->flag (FLAG_WIZ)) { 3595 if ($who->flag (FLAG_WIZ)) {
3287 $who->message ("reloading server."); 3596 $who->message ("reloading server.");
3597 async {
3598 $Coro::current->{desc} = "perl_reload";
3288 async { reload_perl }; 3599 reload_perl;
3600 };
3289 } 3601 }
3290}; 3602};
3291 3603
3292unshift @INC, $LIBDIR; 3604unshift @INC, $LIBDIR;
3293 3605
3295 3607
3296our @WAIT_FOR_TICK; 3608our @WAIT_FOR_TICK;
3297our @WAIT_FOR_TICK_BEGIN; 3609our @WAIT_FOR_TICK_BEGIN;
3298 3610
3299sub wait_for_tick { 3611sub wait_for_tick {
3300 return unless $TICK_WATCHER->is_active; 3612 return if tick_inhibit;
3301 return if $Coro::current == $Coro::main; 3613 return if $Coro::current == $Coro::main;
3302 3614
3303 my $signal = new Coro::Signal; 3615 my $signal = new Coro::Signal;
3304 push @WAIT_FOR_TICK, $signal; 3616 push @WAIT_FOR_TICK, $signal;
3305 $signal->wait; 3617 $signal->wait;
3306} 3618}
3307 3619
3308sub wait_for_tick_begin { 3620sub wait_for_tick_begin {
3309 return unless $TICK_WATCHER->is_active; 3621 return if tick_inhibit;
3310 return if $Coro::current == $Coro::main; 3622 return if $Coro::current == $Coro::main;
3311 3623
3312 my $signal = new Coro::Signal; 3624 my $signal = new Coro::Signal;
3313 push @WAIT_FOR_TICK_BEGIN, $signal; 3625 push @WAIT_FOR_TICK_BEGIN, $signal;
3314 $signal->wait; 3626 $signal->wait;
3315} 3627}
3316 3628
3317 my $min = 1e6;#d# 3629sub tick {
3318 my $avg = 10;
3319$TICK_WATCHER = Event->timer (
3320 reentrant => 0,
3321 parked => 1,
3322 prio => 0,
3323 at => $NEXT_TICK || $TICK,
3324 data => WF_AUTOCANCEL,
3325 cb => sub {
3326 if ($Coro::current != $Coro::main) { 3630 if ($Coro::current != $Coro::main) {
3327 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3631 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3328 unless ++$bug_warning > 10; 3632 unless ++$bug_warning > 10;
3329 return; 3633 return;
3330 } 3634 }
3331 3635
3332 $NOW = $tick_start = Event::time;
3333
3334 cf::server_tick; # one server iteration 3636 cf::server_tick; # one server iteration
3335 3637
3336 0 && sync_job {#d# 3638 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3337 for(1..10) { 3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3338 my $t = Event::time; 3640 Coro::async_pool {
3339 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3641 $Coro::current->{desc} = "runtime saver";
3340 or die; 3642 write_runtime
3341 3643 or warn "ERROR: unable to write runtime file: $!";
3342 $map->width (50);
3343 $map->height (50);
3344 $map->alloc;
3345 $map->_load_objects ("/tmp/x.map", 1);
3346 my $t = Event::time - $t;
3347
3348 #next unless $t < 0.0013;#d#
3349 if ($t < $min) {
3350 $min = $t;
3351 }
3352 $avg = $avg * 0.99 + $t * 0.01;
3353 }
3354 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3355 exit 0;
3356 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3357 }; 3644 };
3645 }
3358 3646
3359 $RUNTIME += $TICK;
3360 $NEXT_TICK += $TICK;
3361
3362 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3363 $NEXT_RUNTIME_WRITE = $NOW + 10;
3364 Coro::async_pool {
3365 write_runtime
3366 or warn "ERROR: unable to write runtime file: $!";
3367 };
3368 }
3369
3370# my $AFTER = Event::time;
3371# warn $AFTER - $NOW;#d#
3372
3373 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3374 $sig->send; 3648 $sig->send;
3375 } 3649 }
3376 while (my $sig = shift @WAIT_FOR_TICK) { 3650 while (my $sig = shift @WAIT_FOR_TICK) {
3377 $sig->send; 3651 $sig->send;
3378 } 3652 }
3379 3653
3380 $NOW = Event::time; 3654 $LOAD = ($NOW - $TICK_START) / $TICK;
3381
3382 # if we are delayed by four ticks or more, skip them all
3383 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3384
3385 $TICK_WATCHER->at ($NEXT_TICK);
3386 $TICK_WATCHER->start;
3387
3388 $LOAD = ($NOW - $tick_start) / $TICK;
3389 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3390 3656
3391 _post_tick; 3657 if (0) {
3392 3658 if ($NEXT_TICK) {
3393 3659 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d#
3662 }
3394 }, 3663 }
3395); 3664}
3396 3665
3397{ 3666{
3398 BDB::max_poll_time $TICK * 0.1; 3667 # configure BDB
3399 $BDB_POLL_WATCHER = Event->io ( 3668
3400 reentrant => 0,
3401 fd => BDB::poll_fileno,
3402 poll => 'r',
3403 prio => 0,
3404 data => WF_AUTOCANCEL,
3405 cb => \&BDB::poll_cb,
3406 );
3407 BDB::min_parallel 8; 3669 BDB::min_parallel 8;
3408 3670 BDB::max_poll_reqs $TICK * 0.1;
3409 BDB::set_sync_prepare { 3671 $Coro::BDB::WATCHER->priority (1);
3410 my $status;
3411 my $current = $Coro::current;
3412 (
3413 sub {
3414 $status = $!;
3415 $current->ready; undef $current;
3416 },
3417 sub {
3418 Coro::schedule while defined $current;
3419 $! = $status;
3420 },
3421 )
3422 };
3423 3672
3424 unless ($DB_ENV) { 3673 unless ($DB_ENV) {
3425 $DB_ENV = BDB::db_env_create; 3674 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3676 | BDB::LOG_AUTOREMOVE, 1);
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3426 3679
3427 cf::sync_job { 3680 cf::sync_job {
3428 eval { 3681 eval {
3429 BDB::db_env_open 3682 BDB::db_env_open
3430 $DB_ENV, 3683 $DB_ENV,
3432 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3685 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3433 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3686 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3434 0666; 3687 0666;
3435 3688
3436 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3689 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3437
3438 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3439 $DB_ENV->set_lk_detect;
3440 }; 3690 };
3441 3691
3442 cf::cleanup "db_env_open(db): $@" if $@; 3692 cf::cleanup "db_env_open(db): $@" if $@;
3443 }; 3693 };
3444 } 3694 }
3695
3696 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3697 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3698 };
3699 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3700 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3701 };
3702 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3703 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3704 };
3445} 3705}
3446 3706
3447{ 3707{
3708 # configure IO::AIO
3709
3448 IO::AIO::min_parallel 8; 3710 IO::AIO::min_parallel 8;
3449
3450 undef $Coro::AIO::WATCHER;
3451 IO::AIO::max_poll_time $TICK * 0.1; 3711 IO::AIO::max_poll_time $TICK * 0.1;
3452 $AIO_POLL_WATCHER = Event->io ( 3712 $Coro::AIO::WATCHER->priority (1);
3453 reentrant => 0,
3454 data => WF_AUTOCANCEL,
3455 fd => IO::AIO::poll_fileno,
3456 poll => 'r',
3457 prio => 6,
3458 cb => \&IO::AIO::poll_cb,
3459 );
3460} 3713}
3461 3714
3462my $_log_backtrace; 3715my $_log_backtrace;
3463 3716
3464sub _log_backtrace { 3717sub _log_backtrace {
3468 3721
3469 # limit the # of concurrent backtraces 3722 # limit the # of concurrent backtraces
3470 if ($_log_backtrace < 2) { 3723 if ($_log_backtrace < 2) {
3471 ++$_log_backtrace; 3724 ++$_log_backtrace;
3472 async { 3725 async {
3726 $Coro::current->{desc} = "abt $msg";
3727
3473 my @bt = fork_call { 3728 my @bt = fork_call {
3474 @addr = map { sprintf "%x", $_ } @addr; 3729 @addr = map { sprintf "%x", $_ } @addr;
3475 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3730 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3476 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3731 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3477 or die "addr2line: $!"; 3732 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines