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.335 by root, Mon Aug 20 22:21:48 2007 UTC vs.
Revision 1.411 by root, Fri Feb 1 15:54:07 2008 UTC

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

Diff Legend

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