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.338 by root, Tue Aug 21 01:07:47 2007 UTC vs.
Revision 1.413 by root, Sun Apr 6 16:13:20 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 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.64 (); 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;
24use Coro::Util (); 46use Coro::Util ();
25 47
26use JSON::XS 1.4 (); 48use JSON::XS 2.01 ();
27use BDB (); 49use BDB ();
28use Data::Dumper; 50use Data::Dumper;
29use Digest::MD5; 51use Digest::MD5;
30use Fcntl; 52use Fcntl;
31use YAML::Syck (); 53use YAML ();
32use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
33use Time::HiRes; 55use Time::HiRes;
34use Compress::LZF; 56use Compress::LZF;
35use Digest::MD5 (); 57use Digest::MD5 ();
36 58
37# configure various modules to our taste 59# configure various modules to our taste
38# 60#
39$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
40Coro::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
41Compress::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
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 64
48$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
49 66
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 68
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
75 93
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 97our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
83 99
84our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 104our $DB_ENV;
86 105
87our %CFG; 106our %CFG;
88 107
89our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 109our $RUNTIME;
110our $NOW;
91 111
92our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
95 115
96# 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 ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 118
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
102 123
103binmode STDOUT; 124binmode STDOUT;
104binmode STDERR; 125binmode STDERR;
105 126
106# read virtual server time, if available 127# read virtual server time, if available
159 180
160The raw value load value from the last tick. 181The raw value load value from the last tick.
161 182
162=item %cf::CFG 183=item %cf::CFG
163 184
164Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 186from wherever your confdir points to.
166 187
167=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
168 189
169These 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
187 $msg .= "\n" 208 $msg .= "\n"
188 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
189 210
190 $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;
191 212
192 utf8::encode $msg;
193 LOG llevError, $msg; 213 LOG llevError, $msg;
194 }; 214 };
195} 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#?
196 231
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
213)) { 248)) {
214 no strict 'refs'; 249 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 251}
217 252
218$Event::DIED = sub { 253$EV::DIED = sub {
219 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
220}; 255};
221 256
222############################################################################# 257#############################################################################
223 258
246 $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;
247 $d 282 $d
248 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
249} 284}
250 285
251=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
252 287
253Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
254 289
255=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
256 291
257Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
258 293
259=cut 294=cut
260 295
261our $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
262 297
263sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
265 300
266=item cf::lock_wait $string 301=item cf::lock_wait $string
267 302
268Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
269 304
272Wait 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
273a 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,
274for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
275returned. 310returned.
276 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
277Lock 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
278uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
279 317
280=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
281 319
282Return 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.
283 321
284=cut 322=cut
285 323
286our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
287 326
288sub lock_wait($) { 327sub lock_wait($) {
289 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#
290 334
291 # wait for lock, if any 335 # wait for lock, if any
292 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 338 Coro::schedule;
300 344
301 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
302 lock_wait $key; 346 lock_wait $key;
303 347
304 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
305 350
306 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
309 } 355 }
310} 356}
311 357
314 360
315 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
316} 362}
317 363
318sub freeze_mainloop { 364sub freeze_mainloop {
319 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
320 366
321 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
322 $TICK_WATCHER->start; 368}
323 }; 369
324 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
325 $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
326} 383}
327 384
328=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
329 386
330Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
341our @SLOT_QUEUE; 398our @SLOT_QUEUE;
342our $SLOT_QUEUE; 399our $SLOT_QUEUE;
343 400
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
346 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
347 406
348 while () { 407 while () {
349 next_job: 408 next_job:
350 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
358 } 417 }
359 } 418 }
360 } 419 }
361 420
362 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
363 # 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
364 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 424 $signal->wait;
366 } else { 425 } else {
367 Coro::schedule; 426 Coro::schedule;
368 } 427 }
391 450
392BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
393 452
394=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
395 454
396The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
397is always able to handle events or runnable, as Crossfire TRT is only 456is always able to handle events or runnable, as Deliantra is only
398partly 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
399acceptable. 458acceptable.
400 459
401If 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
402the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
407 466
408sub sync_job(&) { 467sub sync_job(&) {
409 my ($job) = @_; 468 my ($job) = @_;
410 469
411 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
412 my $time = Event::time; 471 my $time = EV::time;
413 472
414 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
416 475
417 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
418 # (but this is cancel-safe) 477
419 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
420 479
421 my $busy = 1; 480 my $busy = 1;
422 my @res; 481 my @res;
423 482
424 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 485 @res = eval { $job->() };
426 warn $@ if $@; 486 warn $@ if $@;
427 undef $busy; 487 undef $busy;
428 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
429 489
430 while ($busy) { 490 while ($busy) {
431 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
432 } 495 }
496 }
433 497
434 $time = Event::time - $time; 498 my $time = EV::time - $time;
435 499
436 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438
439 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
440 501
441 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
442 } else { 503 } else {
443 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
444 505
469=item fork_call { }, $args 530=item fork_call { }, $args
470 531
471Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
475 536
476=cut 537=cut
477 538
478sub fork_call(&@) { 539sub fork_call(&@) {
479 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
480 541
481 # we seemingly have to make a local copy of the whole thing, 542 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 543 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 544 # TODO: investigate and fix (likely this will be rather laborious)
484 545
485 my @res = Coro::Util::fork_eval { 546 my @res = Coro::Util::fork_eval {
486 reset_signals; 547 reset_signals;
487 &$cb 548 &$cb
488 }, @args; 549 }, @args;
497=item cf::db_put $family => $key => $value 558=item cf::db_put $family => $key => $value
498 559
499Stores 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
500data 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).
501 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
502=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}
503 586
504our $DB; 587our $DB;
505 588
506sub db_init { 589sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 590 cf::sync_job {
511 eval { 591 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 592 };
521} 593}
522 594
523sub db_get($$) { 595sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 596 my $key = "$_[0]/$_[1]";
525 597
575 if (1) { 647 if (1) {
576 $md5 = 648 $md5 =
577 join "\x00", 649 join "\x00",
578 $processversion, 650 $processversion,
579 map { 651 map {
580 Coro::cede; 652 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 653 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 654 } 0.. $#$src;
583 655
584 656
585 my $dbmd5 = db_get cache => "$id/md5"; 657 my $dbmd5 = db_get cache => "$id/md5";
629attach callbacks/event handlers (a collection of which is called an "attachment") 701attach callbacks/event handlers (a collection of which is called an "attachment")
630to it. All such attachable objects support the following methods. 702to it. All such attachable objects support the following methods.
631 703
632In 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>
633C<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
634Crossfire TRT). 706Deliantra).
635 707
636=over 4 708=over 4
637 709
638=item $attachable->attach ($attachment, key => $value...) 710=item $attachable->attach ($attachment, key => $value...)
639 711
921 } 993 }
922 994
923 0 995 0
924} 996}
925 997
926=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 998=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
927 999
928=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1000=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
929 1001
930Generate an object-specific event with the given arguments. 1002Generate an object-specific event with the given arguments.
931 1003
937 1009
938=cut 1010=cut
939 1011
940############################################################################# 1012#############################################################################
941# object support 1013# object support
942#
943 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#
944sub _can_merge { 1048sub _can_merge {
945 my ($ob1, $ob2) = @_; 1049 my ($ob1, $ob2) = @_;
946 1050
947 local $Storable::canonical = 1; 1051 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1052
951 $fob1 eq $fob2 1053 # we do the slow way here
1054 return _object_equal $ob1, $ob2
952} 1055}
953 1056
954sub reattach { 1057sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1058 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1059 my ($obj) = @_;
978cf::attachable->attach ( 1081cf::attachable->attach (
979 prio => -1000000, 1082 prio => -1000000,
980 on_instantiate => sub { 1083 on_instantiate => sub {
981 my ($obj, $data) = @_; 1084 my ($obj, $data) = @_;
982 1085
983 $data = from_json $data; 1086 $data = decode_json $data;
984 1087
985 for (@$data) { 1088 for (@$data) {
986 my ($name, $args) = @$_; 1089 my ($name, $args) = @$_;
987 1090
988 $obj->attach ($name, %{$args || {} }); 1091 $obj->attach ($name, %{$args || {} });
1004sub object_freezer_save { 1107sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1108 my ($filename, $rdata, $objs) = @_;
1006 1109
1007 sync_job { 1110 sync_job {
1008 if (length $$rdata) { 1111 if (length $$rdata) {
1112 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1113 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1114 $decname, length $$rdata, scalar @$objs;
1011 1115
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1117 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1119 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1120 close $fh;
1017 1121
1018 if (@$objs) { 1122 if (@$objs) {
1019 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) {
1020 chmod SAVE_MODE, $fh; 1124 chmod SAVE_MODE, $fh;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1126 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1127 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1128 close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1129 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1130 }
1034 } 1138 }
1035 } else { 1139 } else {
1036 aio_unlink $filename; 1140 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1141 aio_unlink "$filename.pst";
1038 } 1142 }
1039 } 1143 };
1040} 1144}
1041 1145
1042sub object_freezer_as_string { 1146sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1147 my ($rdata, $objs) = @_;
1044 1148
1056 or return; 1160 or return;
1057 1161
1058 unless (aio_stat "$filename.pst") { 1162 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1163 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1164 or return;
1165
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1166 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs};
1062 } 1168 }
1063 1169
1170 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1171 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1172 $decname, length $data, scalar @{$av || []};
1173
1066 return ($data, $av); 1174 ($data, $av)
1067} 1175}
1068 1176
1069=head2 COMMAND CALLBACKS 1177=head2 COMMAND CALLBACKS
1070 1178
1071=over 4 1179=over 4
1220 my $msg = $@ ? "$v->{path}: $@\n" 1328 my $msg = $@ ? "$v->{path}: $@\n"
1221 : "$v->{base}: extension inactive.\n"; 1329 : "$v->{base}: extension inactive.\n";
1222 1330
1223 if (exists $v->{meta}{mandatory}) { 1331 if (exists $v->{meta}{mandatory}) {
1224 warn $msg; 1332 warn $msg;
1225 warn "mandatory extension failed to load, exiting.\n"; 1333 cf::cleanup "mandatory extension failed to load, exiting.";
1226 exit 1;
1227 } 1334 }
1228 1335
1229 warn $msg; 1336 warn $msg;
1230 } 1337 }
1231 1338
1256use Coro::AIO; 1363use Coro::AIO;
1257 1364
1258=head3 cf::player 1365=head3 cf::player
1259 1366
1260=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}
1261 1382
1262=item cf::player::find $login 1383=item cf::player::find $login
1263 1384
1264Returns the given player object, loading it if necessary (might block). 1385Returns the given player object, loading it if necessary (might block).
1265 1386
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1422 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1423 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1424 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1425 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1426
1306 my $pl = load_pl path $login 1427 my $f = new_from_file cf::object::thawer path $login
1307 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;
1308 $cf::PLAYER{$login} = $pl 1434 $cf::PLAYER{$login} = $pl
1309 } 1435 }
1310 } 1436 }
1311} 1437}
1312 1438
1322 1448
1323 aio_mkdir playerdir $pl, 0770; 1449 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1450 $pl->{last_save} = $cf::RUNTIME;
1325 1451
1326 $pl->save_pl ($path); 1452 $pl->save_pl ($path);
1327 Coro::cede; 1453 cf::cede_to_tick;
1328} 1454}
1329 1455
1330sub new($) { 1456sub new($) {
1331 my ($login) = @_; 1457 my ($login) = @_;
1332 1458
1410 or return []; 1536 or return [];
1411 1537
1412 my @logins; 1538 my @logins;
1413 1539
1414 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") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1546 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1547 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 }
1418 1549
1419 utf8::decode $login; 1550 utf8::decode $login;
1420 push @logins, $login; 1551 push @logins, $login;
1421 } 1552 }
1422 1553
1455 1586
1456Expand crossfire pod fragments into protocol xml. 1587Expand crossfire pod fragments into protocol xml.
1457 1588
1458=cut 1589=cut
1459 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
1460sub expand_cfpod { 1602sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1603 my ($self, $pod) = @_;
1462 1604
1463 # escape & and < 1605 my $xml;
1464 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g;
1466 1606
1467 # this is buggy, it needs to properly take care of nested <'s 1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1468 1610
1469 1 while 1611 $group =~ s/&/&amp;/g;
1470 # replace B<>, I<>, U<> etc. 1612 $group =~ s/</&lt;/g;
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1613
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1614 $xml .= $group;
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1615 } elsif ($pod =~ m%\G
1474 # replace G<male|female> tags 1616 ([BCGHITU])
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1617 <
1476 $self->gender ? $2 : $1 1618 (?:
1477 }ge 1619 ([^<>]*) (?{ $group = $^N })
1478 # replace H<hint text> 1620 | < $interior >
1479 || s{H<([^\>]*)>} 1621 )
1622 >
1623 %gcsx
1480 { 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") {
1481 ("<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>",
1482 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1483 "") 1644 "")
1484 [$self->{hintmode}] 1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1485 }ge; 1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1486 1656
1657 for ($xml) {
1487 # create single paragraphs (very hackish) 1658 # create single paragraphs (very hackish)
1488 s/(?<=\S)\n(?=\w)/ /g; 1659 s/(?<=\S)\n(?=\w)/ /g;
1489 1660
1490 # compress some whitespace 1661 # compress some whitespace
1491 s/\s+\n/\n/g; # ws line-ends 1662 s/\s+\n/\n/g; # ws line-ends
1492 s/\n\n+/\n/g; # double lines 1663 s/\n\n+/\n/g; # double lines
1493 s/^\n+//; # beginning lines 1664 s/^\n+//; # beginning lines
1494 s/\n+$//; # ending lines 1665 s/\n+$//; # ending lines
1666 }
1495 1667
1496 $_ 1668 $xml
1497} 1669}
1670
1671no re 'eval';
1498 1672
1499sub hintmode { 1673sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1; 1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode} 1675 $_[0]{hintmode}
1502} 1676}
1746 1920
1747sub load_header_from($) { 1921sub load_header_from($) {
1748 my ($self, $path) = @_; 1922 my ($self, $path) = @_;
1749 1923
1750 utf8::encode $path; 1924 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1925 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 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;
1756 1933
1757 $self->{load_path} = $path; 1934 $self->{load_path} = $path;
1758 1935
1759 1 1936 1
1760} 1937}
1814sub find { 1991sub find {
1815 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
1816 1993
1817 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
1818 1995
1996 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 1997 cf::lock_wait "map_find:$path";
1820 1998
1821 $cf::MAP{$path} || do { 1999 $cf::MAP{$path} || do {
1822 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
1823 my $map = new_from_path cf::map $path 2003 my $map = new_from_path cf::map $path
1824 or return; 2004 or return;
1825 2005
1826 $map->{last_save} = $cf::RUNTIME; 2006 $map->{last_save} = $cf::RUNTIME;
1827 2007
1829 or return; 2009 or return;
1830 2010
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 2012 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 2013 #$cf::WAIT_FOR_TICK->wait;
2014 undef $guard1;
2015 undef $guard2;
1834 $map->reset; 2016 $map->reset;
1835 undef $guard;
1836 return find $path; 2017 return find $path;
1837 } 2018 }
1838 2019
1839 $cf::MAP{$path} = $map 2020 $cf::MAP{$path} = $map
1840 } 2021 }
1849 local $self->{deny_reset} = 1; # loading can take a long time 2030 local $self->{deny_reset} = 1; # loading can take a long time
1850 2031
1851 my $path = $self->{path}; 2032 my $path = $self->{path};
1852 2033
1853 { 2034 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 2035 my $guard = cf::lock_acquire "map_data:$path";
1855 2036
2037 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 2038 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 2039
1858 $self->in_memory (cf::MAP_LOADING); 2040 $self->in_memory (cf::MAP_LOADING);
1859 2041
1860 $self->alloc; 2042 $self->alloc;
1861 2043
1862 $self->pre_load; 2044 $self->pre_load;
1863 Coro::cede; 2045 cf::cede_to_tick;
1864 2046
2047 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 2049 $self->_load_objects ($f)
1866 or return; 2050 or return;
1867 2051
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1869 if delete $self->{load_original}; 2053 if delete $self->{load_original};
1870 2054
1871 if (my $uniq = $self->uniq_path) { 2055 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 2056 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 2057 unless (aio_stat $uniq) {
2058 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 2059 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 2060 $self->_load_objects ($f);
2061 $f->resolve_delayed_derefs;
2062 }
1876 } 2063 }
1877 } 2064 }
1878 2065
1879 Coro::cede; 2066 $f->resolve_delayed_derefs;
2067
2068 cf::cede_to_tick;
1880 # now do the right thing for maps 2069 # now do the right thing for maps
1881 $self->link_multipart_objects; 2070 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 2071 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 2072 unless $self->difficulty;
1884 Coro::cede; 2073 cf::cede_to_tick;
1885 2074
1886 unless ($self->{deny_activate}) { 2075 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 2076 $self->decay_objects;
1888 $self->fix_auto_apply; 2077 $self->fix_auto_apply;
1889 $self->update_buttons; 2078 $self->update_buttons;
1890 Coro::cede; 2079 cf::cede_to_tick;
1891 $self->set_darkness_map; 2080 $self->set_darkness_map;
1892 Coro::cede; 2081 cf::cede_to_tick;
1893 $self->activate; 2082 $self->activate;
1894 } 2083 }
1895 2084
1896 $self->{last_save} = $cf::RUNTIME; 2085 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 2086 $self->last_access ($cf::RUNTIME);
1947} 2136}
1948 2137
1949sub do_load_sync { 2138sub do_load_sync {
1950 my ($map) = @_; 2139 my ($map) = @_;
1951 2140
2141 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2142 if $Coro::current == $Coro::main;
2143
1952 cf::sync_job { $map->load }; 2144 cf::sync_job { $map->load };
1953} 2145}
1954 2146
1955our %MAP_PREFETCH; 2147our %MAP_PREFETCH;
1956our $MAP_PREFETCHER = undef; 2148our $MAP_PREFETCHER = undef;
1957 2149
1958sub find_async { 2150sub find_async {
1959 my ($path, $origin) = @_; 2151 my ($path, $origin, $load) = @_;
1960 2152
1961 $path = normalise $path, $origin && $origin->{path}; 2153 $path = normalise $path, $origin && $origin->{path};
1962 2154
1963 if (my $map = $cf::MAP{$path}) { 2155 if (my $map = $cf::MAP{$path}) {
1964 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1965 } 2157 }
1966 2158
1967 undef $MAP_PREFETCH{$path}; 2159 $MAP_PREFETCH{$path} |= $load;
2160
1968 $MAP_PREFETCHER ||= cf::async { 2161 $MAP_PREFETCHER ||= cf::async {
2162 $Coro::current->{desc} = "map prefetcher";
2163
1969 while (%MAP_PREFETCH) { 2164 while (%MAP_PREFETCH) {
1970 for my $path (keys %MAP_PREFETCH) { 2165 while (my ($k, $v) = each %MAP_PREFETCH) {
1971 if (my $map = find $path) { 2166 if (my $map = find $k) {
1972 $map->load; 2167 $map->load if $v;
1973 } 2168 }
1974 2169
1975 delete $MAP_PREFETCH{$path}; 2170 delete $MAP_PREFETCH{$k};
1976 } 2171 }
1977 } 2172 }
1978 undef $MAP_PREFETCHER; 2173 undef $MAP_PREFETCHER;
1979 }; 2174 };
1980 $MAP_PREFETCHER->prio (6); 2175 $MAP_PREFETCHER->prio (6);
1983} 2178}
1984 2179
1985sub save { 2180sub save {
1986 my ($self) = @_; 2181 my ($self) = @_;
1987 2182
1988 my $lock = cf::lock_acquire "map_data:" . $self->path; 2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
1989 2184
1990 $self->{last_save} = $cf::RUNTIME; 2185 $self->{last_save} = $cf::RUNTIME;
1991 2186
1992 return unless $self->dirty; 2187 return unless $self->dirty;
1993 2188
1999 return if $self->{deny_save}; 2194 return if $self->{deny_save};
2000 2195
2001 local $self->{last_access} = $self->last_access;#d# 2196 local $self->{last_access} = $self->last_access;#d#
2002 2197
2003 cf::async { 2198 cf::async {
2199 $Coro::current->{desc} = "map player save";
2004 $_->contr->save for $self->players; 2200 $_->contr->save for $self->players;
2005 }; 2201 };
2006 2202
2007 if ($uniq) { 2203 if ($uniq) {
2008 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2016 my ($self) = @_; 2212 my ($self) = @_;
2017 2213
2018 # save first because save cedes 2214 # save first because save cedes
2019 $self->save; 2215 $self->save;
2020 2216
2021 my $lock = cf::lock_acquire "map_data:" . $self->path; 2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
2022 2218
2023 return if $self->players; 2219 return if $self->players;
2024 return if $self->in_memory != cf::MAP_IN_MEMORY; 2220 return if $self->in_memory != cf::MAP_IN_MEMORY;
2025 return if $self->{deny_save}; 2221 return if $self->{deny_save};
2026 2222
2223 $self->in_memory (cf::MAP_SWAPPED);
2224
2225 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP;
2027 $self->clear; 2227 $self->clear;
2028 $self->in_memory (cf::MAP_SWAPPED);
2029} 2228}
2030 2229
2031sub reset_at { 2230sub reset_at {
2032 my ($self) = @_; 2231 my ($self) = @_;
2033 2232
2065 if $uniq; 2264 if $uniq;
2066 } 2265 }
2067 2266
2068 delete $cf::MAP{$self->path}; 2267 delete $cf::MAP{$self->path};
2069 2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
2070 $self->clear; 2271 $self->clear;
2071
2072 $_->clear_links_to ($self) for values %cf::MAP;
2073 2272
2074 $self->unlink_save; 2273 $self->unlink_save;
2075 $self->destroy; 2274 $self->destroy;
2076} 2275}
2077 2276
2078my $nuke_counter = "aaaa"; 2277my $nuke_counter = "aaaa";
2079 2278
2080sub nuke { 2279sub nuke {
2081 my ($self) = @_; 2280 my ($self) = @_;
2082 2281
2282 {
2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2284
2083 delete $cf::MAP{$self->path}; 2285 delete $cf::MAP{$self->path};
2084 2286
2085 $self->unlink_save; 2287 $self->unlink_save;
2086 2288
2087 bless $self, "cf::map"; 2289 bless $self, "cf::map";
2088 delete $self->{deny_reset}; 2290 delete $self->{deny_reset};
2089 $self->{deny_save} = 1; 2291 $self->{deny_save} = 1;
2090 $self->reset_timeout (1); 2292 $self->reset_timeout (1);
2091 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2293 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2092 2294
2093 $cf::MAP{$self->path} = $self; 2295 $cf::MAP{$self->path} = $self;
2296 }
2094 2297
2095 $self->reset; # polite request, might not happen 2298 $self->reset; # polite request, might not happen
2096} 2299}
2097 2300
2098=item $maps = cf::map::tmp_maps 2301=item $maps = cf::map::tmp_maps
2174 2377
2175sub inv_recursive { 2378sub inv_recursive {
2176 inv_recursive_ inv $_[0] 2379 inv_recursive_ inv $_[0]
2177} 2380}
2178 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
2179package cf; 2410package cf;
2180 2411
2181=back 2412=back
2182 2413
2183=head3 cf::object::player 2414=head3 cf::object::player
2341 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2342 2573
2343 $self->enter_link; 2574 $self->enter_link;
2344 2575
2345 (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
2346 my $map = eval { 2598 my $map = eval {
2347 my $map = cf::map::find $path; 2599 my $map = defined $path ? cf::map::find $path : undef;
2348 2600
2349 if ($map) { 2601 if ($map) {
2350 $map = $map->customise_for ($self); 2602 $map = $map->customise_for ($self);
2351 $map = $check->($map) if $check && $map; 2603 $map = $check->($map) if $check && $map;
2352 } else { 2604 } else {
2353 $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);
2354 } 2606 }
2355 2607
2356 $map 2608 $map
2357 }; 2609 };
2358 2610
2411 $rmp->{origin_y} = $exit->y; 2663 $rmp->{origin_y} = $exit->y;
2412 } 2664 }
2413 2665
2414 $rmp->{random_seed} ||= $exit->random_seed; 2666 $rmp->{random_seed} ||= $exit->random_seed;
2415 2667
2416 my $data = cf::to_json $rmp; 2668 my $data = cf::encode_json $rmp;
2417 my $md5 = Digest::MD5::md5_hex $data; 2669 my $md5 = Digest::MD5::md5_hex $data;
2418 my $meta = "$RANDOMDIR/$md5.meta"; 2670 my $meta = "$RANDOMDIR/$md5.meta";
2419 2671
2420 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2421 aio_write $fh, 0, (length $data), $data, 0; 2673 aio_write $fh, 0, (length $data), $data, 0;
2448 # if exit is damned, update players death & WoR home-position 2700 # if exit is damned, update players death & WoR home-position
2449 $self->contr->savebed ($slaying, $hp, $sp) 2701 $self->contr->savebed ($slaying, $hp, $sp)
2450 if $exit->flag (FLAG_DAMNED); 2702 if $exit->flag (FLAG_DAMNED);
2451 2703
2452 (async { 2704 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2706
2453 $self->deactivate_recursive; # just to be sure 2707 $self->deactivate_recursive; # just to be sure
2454 unless (eval { 2708 unless (eval {
2455 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($slaying, $hp, $sp);
2456 2710
2457 1; 2711 1;
2492the 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
2493the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2494 2748
2495=cut 2749=cut
2496 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
2497sub cf::client::send_msg { 2803sub cf::client::send_msg {
2498 my ($self, $channel, $msg, $color, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2499 2805
2500 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg);
2501 2807
2502 $color &= cf::NDI_CLIENT_MASK; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2503 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
2504 if (ref $channel) { 2819 } elsif (ref $channel) {
2505 # send meta info to client, if not yet sent 2820 # send meta info to client, if not yet sent
2506 unless (exists $self->{channel}{$channel->{id}}) { 2821 unless (exists $self->{channel}{$channel->{id}}) {
2507 $self->{channel}{$channel->{id}} = $channel; 2822 $self->{channel}{$channel->{id}} = $channel;
2508 $self->ext_msg (channel_info => $channel); 2823 $self->ext_msg (channel_info => $channel)
2824 if $self->can_msg;
2509 } 2825 }
2510 2826
2511 $channel = $channel->{id}; 2827 $channel = $channel->{id};
2512 } 2828 }
2513 2829
2554=cut 2870=cut
2555 2871
2556sub cf::client::ext_msg($$@) { 2872sub cf::client::ext_msg($$@) {
2557 my ($self, $type, @msg) = @_; 2873 my ($self, $type, @msg) = @_;
2558 2874
2559 my $extcmd = $self->extcmd;
2560
2561 if ($extcmd == 2) { 2875 if ($self->extcmd == 2) {
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2563 } elsif ($extcmd == 1) { # TODO: remove 2877 } elsif ($self->extcmd == 1) { # TODO: remove
2564 push @msg, msgtype => "event_$type"; 2878 push @msg, msgtype => "event_$type";
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2566 } 2880 }
2567} 2881}
2568 2882
2575sub cf::client::ext_reply($$@) { 2889sub cf::client::ext_reply($$@) {
2576 my ($self, $id, @msg) = @_; 2890 my ($self, $id, @msg) = @_;
2577 2891
2578 if ($self->extcmd == 2) { 2892 if ($self->extcmd == 2) {
2579 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2893 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2580 } elsif ($self->ns->extcmd == 1) { 2894 } elsif ($self->extcmd == 1) {
2581 #TODO: version 1, remove 2895 #TODO: version 1, remove
2582 unshift @msg, msgtype => "reply", msgid => $id; 2896 unshift @msg, msgtype => "reply", msgid => $id;
2583 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2897 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2584 } 2898 }
2585} 2899}
2727=pod 3041=pod
2728 3042
2729The following functions and methods are available within a safe environment: 3043The following functions and methods are available within a safe environment:
2730 3044
2731 cf::object 3045 cf::object
2732 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
2733 insert remove name archname title slaying race 3047 insert remove name archname title slaying race decrease_ob_nr
2734 3048
2735 cf::object::player 3049 cf::object::player
2736 player 3050 player
2737 3051
2738 cf::player 3052 cf::player
2743 3057
2744=cut 3058=cut
2745 3059
2746for ( 3060for (
2747 ["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
2748 insert remove inv name archname title slaying race)], 3062 insert remove inv name archname title slaying race
3063 decrease_ob_nr destroy)],
2749 ["cf::object::player" => qw(player)], 3064 ["cf::object::player" => qw(player)],
2750 ["cf::player" => qw(peaceful)], 3065 ["cf::player" => qw(peaceful)],
2751 ["cf::map" => qw(trigger)], 3066 ["cf::map" => qw(trigger)],
2752) { 3067) {
2753 no strict 'refs'; 3068 no strict 'refs';
2829# the server's init and main functions 3144# the server's init and main functions
2830 3145
2831sub load_facedata($) { 3146sub load_facedata($) {
2832 my ($path) = @_; 3147 my ($path) = @_;
2833 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
2834 my $enc = JSON::XS->new->utf8->canonical; 3153 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2835 3154
2836 warn "loading facedata from $path\n"; 3155 warn "loading facedata from $path\n";
2837 3156
2838 my $facedata; 3157 my $facedata;
2839 0 < aio_load $path, $facedata 3158 0 < aio_load $path, $facedata
2854 { 3173 {
2855 my $faces = $facedata->{faceinfo}; 3174 my $faces = $facedata->{faceinfo};
2856 3175
2857 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2858 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3177 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178
2859 cf::face::set_visibility $idx, $info->{visibility}; 3179 cf::face::set_visibility $idx, $info->{visibility};
2860 cf::face::set_magicmap $idx, $info->{magicmap}; 3180 cf::face::set_magicmap $idx, $info->{magicmap};
2861 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2862 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2863 3183
2864 cf::cede_to_tick; 3184 cf::cede_to_tick;
2865 } 3185 }
2866 3186
2867 while (my ($face, $info) = each %$faces) { 3187 while (my ($face, $info) = each %$faces) {
2868 next unless $info->{smooth}; 3188 next unless $info->{smooth};
3189
2869 my $idx = cf::face::find $face 3190 my $idx = cf::face::find $face
2870 or next; 3191 or next;
3192
2871 if (my $smooth = cf::face::find $info->{smooth}) { 3193 if (my $smooth = cf::face::find $info->{smooth}) {
2872 cf::face::set_smooth $idx, $smooth; 3194 cf::face::set_smooth $idx, $smooth;
2873 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2874 } else { 3196 } else {
2875 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3197 warn "smooth face '$info->{smooth}' not found for face '$face'";
2893 { 3215 {
2894 # TODO: for gcfclient pleasure, we should give resources 3216 # TODO: for gcfclient pleasure, we should give resources
2895 # that gcfclient doesn't grok a >10000 face index. 3217 # that gcfclient doesn't grok a >10000 face index.
2896 my $res = $facedata->{resource}; 3218 my $res = $facedata->{resource};
2897 3219
2898 my $soundconf = delete $res->{"res/sound.conf"};
2899
2900 while (my ($name, $info) = each %$res) { 3220 while (my ($name, $info) = each %$res) {
3221 if (defined $info->{type}) {
2901 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3222 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2902 my $data; 3223 my $data;
2903 3224
2904 if ($info->{type} & 1) { 3225 if ($info->{type} & 1) {
2905 # prepend meta info 3226 # prepend meta info
2906 3227
2907 my $meta = $enc->encode ({ 3228 my $meta = $enc->encode ({
2908 name => $name, 3229 name => $name,
2909 %{ $info->{meta} || {} }, 3230 %{ $info->{meta} || {} },
2910 }); 3231 });
2911 3232
2912 $data = pack "(w/a*)*", $meta, $info->{data}; 3233 $data = pack "(w/a*)*", $meta, $info->{data};
3234 } else {
3235 $data = $info->{data};
3236 }
3237
3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type};
2913 } else { 3240 } else {
2914 $data = $info->{data}; 3241 $RESOURCE{$name} = $info;
2915 } 3242 }
2916 3243
2917 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2918 cf::face::set_type $idx, $info->{type};
2919
2920 cf::cede_to_tick; 3244 cf::cede_to_tick;
2921 } 3245 }
2922
2923 if ($soundconf) {
2924 $soundconf = $enc->decode (delete $soundconf->{data});
2925
2926 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2927 my $sound = $soundconf->{compat}[$_]
2928 or next;
2929
2930 my $face = cf::face::find "sound/$sound->[1]";
2931 cf::sound::set $sound->[0] => $face;
2932 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2933 }
2934
2935 while (my ($k, $v) = each %{$soundconf->{event}}) {
2936 my $face = cf::face::find "sound/$v";
2937 cf::sound::set $k => $face;
2938 }
2939 }
2940 } 3246 }
3247
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2941 3249
2942 1 3250 1
2943} 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});
2944 3272
2945register_exticmd fx_want => sub { 3273register_exticmd fx_want => sub {
2946 my ($ns, $want) = @_; 3274 my ($ns, $want) = @_;
2947 3275
2948 while (my ($k, $v) = each %$want) { 3276 while (my ($k, $v) = each %$want) {
2949 $ns->fx_want ($k, $v); 3277 $ns->fx_want ($k, $v);
2950 } 3278 }
2951}; 3279};
2952 3280
2953sub 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
2954 load_resource_file "$MAPDIR/regions" 3286 load_resource_file "$MAPDIR/regions"
2955 or die "unable to load regions file\n"; 3287 or die "unable to load regions file\n";
2956 3288
2957 for (cf::region::list) { 3289 for (cf::region::list) {
2958 $_->{match} = qr/$_->{match}/ 3290 $_->{match} = qr/$_->{match}/
2994 3326
2995sub init { 3327sub init {
2996 reload_resources; 3328 reload_resources;
2997} 3329}
2998 3330
2999sub cfg_load { 3331sub reload_config {
3000 open my $fh, "<:utf8", "$CONFDIR/config" 3332 open my $fh, "<:utf8", "$CONFDIR/config"
3001 or return; 3333 or return;
3002 3334
3003 local $/; 3335 local $/;
3004 *CFG = YAML::Syck::Load <$fh>; 3336 *CFG = YAML::Load <$fh>;
3005 3337
3006 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3007 3339
3008 $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};
3009 $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};
3020sub main { 3352sub main {
3021 # we must not ever block the main coroutine 3353 # we must not ever block the main coroutine
3022 local $Coro::idle = sub { 3354 local $Coro::idle = sub {
3023 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#
3024 (async { 3356 (async {
3025 Event::one_event; 3357 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT;
3026 })->prio (Coro::PRIO_MAX); 3359 })->prio (Coro::PRIO_MAX);
3027 }; 3360 };
3028 3361
3029 cfg_load; 3362 reload_config;
3030 db_init; 3363 db_init;
3031 load_extensions; 3364 load_extensions;
3032 3365
3033 $TICK_WATCHER->start; 3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno;
3034 Event::loop; 3368 EV::loop;
3035} 3369}
3036 3370
3037############################################################################# 3371#############################################################################
3038# initialisation and cleanup 3372# initialisation and cleanup
3039 3373
3040# install some emergency cleanup handlers 3374# install some emergency cleanup handlers
3041BEGIN { 3375BEGIN {
3376 our %SIGWATCHER = ();
3042 for my $signal (qw(INT HUP TERM)) { 3377 for my $signal (qw(INT HUP TERM)) {
3043 Event->signal ( 3378 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3044 reentrant => 0,
3045 data => WF_AUTOCANCEL,
3046 signal => $signal,
3047 prio => 0,
3048 cb => sub {
3049 cf::cleanup "SIG$signal"; 3379 cf::cleanup "SIG$signal";
3050 },
3051 ); 3380 };
3052 } 3381 }
3053} 3382}
3054 3383
3055sub write_runtime { 3384sub write_runtime {
3056 my $runtime = "$LOCALDIR/runtime"; 3385 my $runtime = "$LOCALDIR/runtime";
3101 # and maps saved/destroyed asynchronously. 3430 # and maps saved/destroyed asynchronously.
3102 warn "begin emergency player save\n"; 3431 warn "begin emergency player save\n";
3103 for my $login (keys %cf::PLAYER) { 3432 for my $login (keys %cf::PLAYER) {
3104 my $pl = $cf::PLAYER{$login} or next; 3433 my $pl = $cf::PLAYER{$login} or next;
3105 $pl->valid or next; 3434 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3106 $pl->save; 3436 $pl->save;
3107 } 3437 }
3108 warn "end emergency player save\n"; 3438 warn "end emergency player save\n";
3109 3439
3110 warn "begin emergency map save\n"; 3440 warn "begin emergency map save\n";
3149 warn "syncing database to disk"; 3479 warn "syncing database to disk";
3150 BDB::db_env_txn_checkpoint $DB_ENV; 3480 BDB::db_env_txn_checkpoint $DB_ENV;
3151 3481
3152 # 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
3153 3483
3154 warn "cancelling all WF_AUTOCANCEL watchers";
3155 for (Event::all_watchers) {
3156 $_->cancel if $_->data & WF_AUTOCANCEL;
3157 }
3158
3159 warn "flushing outstanding aio requests"; 3484 warn "flushing outstanding aio requests";
3160 for (;;) { 3485 for (;;) {
3161 BDB::flush; 3486 BDB::flush;
3162 IO::AIO::flush; 3487 IO::AIO::flush;
3163 Coro::cede; 3488 Coro::cede_notself;
3164 last unless IO::AIO::nreqs || BDB::nreqs; 3489 last unless IO::AIO::nreqs || BDB::nreqs;
3165 warn "iterate..."; 3490 warn "iterate...";
3166 } 3491 }
3167 3492
3168 ++$RELOAD; 3493 ++$RELOAD;
3227 warn "reloading cf.pm"; 3552 warn "reloading cf.pm";
3228 require cf; 3553 require cf;
3229 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3230 3555
3231 warn "loading config and database again"; 3556 warn "loading config and database again";
3232 cf::cfg_load; 3557 cf::reload_config;
3233 3558
3234 warn "loading extensions"; 3559 warn "loading extensions";
3235 cf::load_extensions; 3560 cf::load_extensions;
3236 3561
3237 warn "reattaching attachments to objects/players"; 3562 warn "reattaching attachments to objects/players";
3244 warn "leaving sync_job"; 3569 warn "leaving sync_job";
3245 3570
3246 1 3571 1
3247 } or do { 3572 } or do {
3248 warn $@; 3573 warn $@;
3249 warn "error while reloading, exiting."; 3574 cf::cleanup "error while reloading, exiting.";
3250 exit 1;
3251 }; 3575 };
3252 3576
3253 warn "reloaded"; 3577 warn "reloaded";
3254}; 3578};
3255 3579
3257 3581
3258sub reload_perl() { 3582sub reload_perl() {
3259 # doing reload synchronously and two reloads happen back-to-back, 3583 # doing reload synchronously and two reloads happen back-to-back,
3260 # coro crashes during coro_state_free->destroy here. 3584 # coro crashes during coro_state_free->destroy here.
3261 3585
3262 $RELOAD_WATCHER ||= Event->timer ( 3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3263 reentrant => 0,
3264 after => 0,
3265 data => WF_AUTOCANCEL,
3266 cb => sub {
3267 do_reload_perl; 3587 do_reload_perl;
3268 undef $RELOAD_WATCHER; 3588 undef $RELOAD_WATCHER;
3269 },
3270 ); 3589 };
3271} 3590}
3272 3591
3273register_command "reload" => sub { 3592register_command "reload" => sub {
3274 my ($who, $arg) = @_; 3593 my ($who, $arg) = @_;
3275 3594
3276 if ($who->flag (FLAG_WIZ)) { 3595 if ($who->flag (FLAG_WIZ)) {
3277 $who->message ("reloading server."); 3596 $who->message ("reloading server.");
3597 async {
3598 $Coro::current->{desc} = "perl_reload";
3278 async { reload_perl }; 3599 reload_perl;
3600 };
3279 } 3601 }
3280}; 3602};
3281 3603
3282unshift @INC, $LIBDIR; 3604unshift @INC, $LIBDIR;
3283 3605
3285 3607
3286our @WAIT_FOR_TICK; 3608our @WAIT_FOR_TICK;
3287our @WAIT_FOR_TICK_BEGIN; 3609our @WAIT_FOR_TICK_BEGIN;
3288 3610
3289sub wait_for_tick { 3611sub wait_for_tick {
3290 return unless $TICK_WATCHER->is_active; 3612 return if tick_inhibit;
3291 return if $Coro::current == $Coro::main; 3613 return if $Coro::current == $Coro::main;
3292 3614
3293 my $signal = new Coro::Signal; 3615 my $signal = new Coro::Signal;
3294 push @WAIT_FOR_TICK, $signal; 3616 push @WAIT_FOR_TICK, $signal;
3295 $signal->wait; 3617 $signal->wait;
3296} 3618}
3297 3619
3298sub wait_for_tick_begin { 3620sub wait_for_tick_begin {
3299 return unless $TICK_WATCHER->is_active; 3621 return if tick_inhibit;
3300 return if $Coro::current == $Coro::main; 3622 return if $Coro::current == $Coro::main;
3301 3623
3302 my $signal = new Coro::Signal; 3624 my $signal = new Coro::Signal;
3303 push @WAIT_FOR_TICK_BEGIN, $signal; 3625 push @WAIT_FOR_TICK_BEGIN, $signal;
3304 $signal->wait; 3626 $signal->wait;
3305} 3627}
3306 3628
3307 my $min = 1e6;#d# 3629sub tick {
3308 my $avg = 10;
3309$TICK_WATCHER = Event->timer (
3310 reentrant => 0,
3311 parked => 1,
3312 prio => 0,
3313 at => $NEXT_TICK || $TICK,
3314 data => WF_AUTOCANCEL,
3315 cb => sub {
3316 if ($Coro::current != $Coro::main) { 3630 if ($Coro::current != $Coro::main) {
3317 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"
3318 unless ++$bug_warning > 10; 3632 unless ++$bug_warning > 10;
3319 return; 3633 return;
3320 } 3634 }
3321 3635
3322 $NOW = $tick_start = Event::time;
3323
3324 cf::server_tick; # one server iteration 3636 cf::server_tick; # one server iteration
3325 3637
3326 0 && sync_job {#d# 3638 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3327 for(1..10) { 3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3328 my $t = Event::time; 3640 Coro::async_pool {
3329 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3641 $Coro::current->{desc} = "runtime saver";
3330 or die; 3642 write_runtime
3331 3643 or warn "ERROR: unable to write runtime file: $!";
3332 $map->width (50);
3333 $map->height (50);
3334 $map->alloc;
3335 $map->_load_objects ("/tmp/x.map", 1);
3336 my $t = Event::time - $t;
3337
3338 #next unless $t < 0.0013;#d#
3339 if ($t < $min) {
3340 $min = $t;
3341 }
3342 $avg = $avg * 0.99 + $t * 0.01;
3343 }
3344 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3345 exit 0;
3346 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3347 }; 3644 };
3645 }
3348 3646
3349 $RUNTIME += $TICK;
3350 $NEXT_TICK += $TICK;
3351
3352 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3353 $NEXT_RUNTIME_WRITE = $NOW + 10;
3354 Coro::async_pool {
3355 write_runtime
3356 or warn "ERROR: unable to write runtime file: $!";
3357 };
3358 }
3359
3360# my $AFTER = Event::time;
3361# warn $AFTER - $NOW;#d#
3362
3363 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3364 $sig->send; 3648 $sig->send;
3365 } 3649 }
3366 while (my $sig = shift @WAIT_FOR_TICK) { 3650 while (my $sig = shift @WAIT_FOR_TICK) {
3367 $sig->send; 3651 $sig->send;
3368 } 3652 }
3369 3653
3370 $NOW = Event::time; 3654 $LOAD = ($NOW - $TICK_START) / $TICK;
3371
3372 # if we are delayed by four ticks or more, skip them all
3373 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3374
3375 $TICK_WATCHER->at ($NEXT_TICK);
3376 $TICK_WATCHER->start;
3377
3378 $LOAD = ($NOW - $tick_start) / $TICK;
3379 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3380 3656
3381 _post_tick; 3657 if (0) {
3382 3658 if ($NEXT_TICK) {
3383 3659 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d#
3662 }
3384 }, 3663 }
3385); 3664}
3386 3665
3387{ 3666{
3388 BDB::max_poll_time $TICK * 0.1; 3667 # configure BDB
3389 $BDB_POLL_WATCHER = Event->io ( 3668
3390 reentrant => 0,
3391 fd => BDB::poll_fileno,
3392 poll => 'r',
3393 prio => 0,
3394 data => WF_AUTOCANCEL,
3395 cb => \&BDB::poll_cb,
3396 );
3397 BDB::min_parallel 8; 3669 BDB::min_parallel 8;
3398 3670 BDB::max_poll_reqs $TICK * 0.1;
3399 BDB::set_sync_prepare { 3671 $Coro::BDB::WATCHER->priority (1);
3400 my $status;
3401 my $current = $Coro::current;
3402 (
3403 sub {
3404 $status = $!;
3405 $current->ready; undef $current;
3406 },
3407 sub {
3408 Coro::schedule while defined $current;
3409 $! = $status;
3410 },
3411 )
3412 };
3413 3672
3414 unless ($DB_ENV) { 3673 unless ($DB_ENV) {
3415 $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);
3416 3679
3417 cf::sync_job { 3680 cf::sync_job {
3418 eval { 3681 eval {
3419 BDB::db_env_open 3682 BDB::db_env_open
3420 $DB_ENV, 3683 $DB_ENV,
3422 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
3423 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3686 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3424 0666; 3687 0666;
3425 3688
3426 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3689 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3427
3428 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3429 $DB_ENV->set_lk_detect;
3430 }; 3690 };
3431 3691
3432 cf::cleanup "db_env_open(db): $@" if $@; 3692 cf::cleanup "db_env_open(db): $@" if $@;
3433 }; 3693 };
3434 } 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 };
3435} 3705}
3436 3706
3437{ 3707{
3708 # configure IO::AIO
3709
3438 IO::AIO::min_parallel 8; 3710 IO::AIO::min_parallel 8;
3439
3440 undef $Coro::AIO::WATCHER;
3441 IO::AIO::max_poll_time $TICK * 0.1; 3711 IO::AIO::max_poll_time $TICK * 0.1;
3442 $AIO_POLL_WATCHER = Event->io ( 3712 $Coro::AIO::WATCHER->priority (1);
3443 reentrant => 0,
3444 data => WF_AUTOCANCEL,
3445 fd => IO::AIO::poll_fileno,
3446 poll => 'r',
3447 prio => 6,
3448 cb => \&IO::AIO::poll_cb,
3449 );
3450} 3713}
3451 3714
3452my $_log_backtrace; 3715my $_log_backtrace;
3453 3716
3454sub _log_backtrace { 3717sub _log_backtrace {
3458 3721
3459 # limit the # of concurrent backtraces 3722 # limit the # of concurrent backtraces
3460 if ($_log_backtrace < 2) { 3723 if ($_log_backtrace < 2) {
3461 ++$_log_backtrace; 3724 ++$_log_backtrace;
3462 async { 3725 async {
3726 $Coro::current->{desc} = "abt $msg";
3727
3463 my @bt = fork_call { 3728 my @bt = fork_call {
3464 @addr = map { sprintf "%x", $_ } @addr; 3729 @addr = map { sprintf "%x", $_ } @addr;
3465 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3730 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3466 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 |"
3467 or die "addr2line: $!"; 3732 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines