ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.283 by root, Sun Jun 24 04:09:29 2007 UTC vs.
Revision 1.411 by root, Fri Feb 1 15:54:07 2008 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV 1.86;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
25use Coro::Util ();
24 26
27use JSON::XS 2.01 ();
25use BDB (); 28use BDB ();
26use Data::Dumper; 29use Data::Dumper;
27use Digest::MD5; 30use Digest::MD5;
28use Fcntl; 31use Fcntl;
29use YAML::Syck (); 32use YAML ();
30use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
31use Time::HiRes; 34use Time::HiRes;
32use Compress::LZF; 35use Compress::LZF;
36use Digest::MD5 ();
33 37
34# configure various modules to our taste 38# configure various modules to our taste
35# 39#
36$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
37Coro::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
38Compress::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
39 43
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$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
46 45
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 47
49our %COMMAND = (); 48our %COMMAND = ();
50our %COMMAND_TIME = (); 49our %COMMAND_TIME = ();
51 50
52our @EXTS = (); # list of extension package names 51our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 52our %EXTCMD = ();
53our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
56 56
57our $RELOAD; # number of reloads so far 57our $RELOAD; # number of reloads so far
58our @EVENT; 58our @EVENT;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
71 72
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER; 74our $TICK_WATCHER;
74our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 77our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
79 79
80our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 84our $DB_ENV;
82 85
83our %CFG; 86our %CFG;
84 87
85our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 89our $RUNTIME;
90our $NOW;
87 91
88our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
91 95
92# 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 ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 98
155 159
156The raw value load value from the last tick. 160The raw value load value from the last tick.
157 161
158=item %cf::CFG 162=item %cf::CFG
159 163
160Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 165from wherever your confdir points to.
162 166
163=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
164 168
165These 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
166returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
178
169=back 179=back
170 180
171=cut 181=cut
172 182
173BEGIN { 183BEGIN {
177 $msg .= "\n" 187 $msg .= "\n"
178 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
179 189
180 $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;
181 191
182 utf8::encode $msg;
183 LOG llevError, $msg; 192 LOG llevError, $msg;
184 }; 193 };
185} 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#?
186 210
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
203)) { 227)) {
204 no strict 'refs'; 228 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 230}
207 231
208$Event::DIED = sub { 232$EV::DIED = sub {
209 warn "error in event callback: @_"; 233 warn "error in event callback: @_";
210}; 234};
211 235
212############################################################################# 236#############################################################################
213 237
236 $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;
237 $d 261 $d
238 } || "[unable to dump $_[0]: '$@']"; 262 } || "[unable to dump $_[0]: '$@']";
239} 263}
240 264
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 265=item $ref = cf::decode_json $json
244 266
245Converts a JSON string into the corresponding perl data structure. 267Converts a JSON string into the corresponding perl data structure.
246 268
247=item $json = cf::to_json $ref 269=item $json = cf::encode_json $ref
248 270
249Converts a perl data structure into its JSON representation. 271Converts a perl data structure into its JSON representation.
272
273=cut
274
275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
276
277sub encode_json($) { $json_coder->encode ($_[0]) }
278sub decode_json($) { $json_coder->decode ($_[0]) }
250 279
251=item cf::lock_wait $string 280=item cf::lock_wait $string
252 281
253Wait until the given lock is available. See cf::lock_acquire. 282Wait until the given lock is available. See cf::lock_acquire.
254 283
257Wait 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
258a 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,
259for example when the coroutine gets canceled), the lock is automatically 288for example when the coroutine gets canceled), the lock is automatically
260returned. 289returned.
261 290
291Locks are *not* recursive, locking from the same coro twice results in a
292deadlocked coro.
293
262Lock 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
263uses map_find and cf::map::load uses map_load). 295uses map_find and cf::map::load uses map_load).
264 296
265=item $locked = cf::lock_active $string 297=item $locked = cf::lock_active $string
266 298
267Return 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.
268 300
269=cut 301=cut
270 302
271our %LOCK; 303our %LOCK;
304our %LOCKER;#d#
272 305
273sub lock_wait($) { 306sub lock_wait($) {
274 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#
275 313
276 # wait for lock, if any 314 # wait for lock, if any
277 while ($LOCK{$key}) { 315 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current; 316 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule; 317 Coro::schedule;
285 323
286 # wait, to be sure we are not locked 324 # wait, to be sure we are not locked
287 lock_wait $key; 325 lock_wait $key;
288 326
289 $LOCK{$key} = []; 327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
290 329
291 Coro::guard { 330 Coro::guard {
331 delete $LOCKER{$key};#d#
292 # wake up all waiters, to be on the safe side 332 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} }; 333 $_->ready for @{ delete $LOCK{$key} };
294 } 334 }
295} 335}
296 336
308 }; 348 };
309 $TICK_WATCHER->stop; 349 $TICK_WATCHER->stop;
310 $guard 350 $guard
311} 351}
312 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
368=item cf::get_slot $time[, $priority[, $name]]
369
370Allocate $time seconds of blocking CPU time at priority C<$priority>:
371This call blocks and returns only when you have at least C<$time> seconds
372of cpu time till the next tick. The slot is only valid till the next cede.
373
374The optional C<$name> can be used to identify the job to run. It might be
375used for statistical purposes and should identify the same time-class.
376
377Useful for short background jobs.
378
379=cut
380
381our @SLOT_QUEUE;
382our $SLOT_QUEUE;
383
384$SLOT_QUEUE->cancel if $SLOT_QUEUE;
385$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager");
387
388 my $signal = new Coro::Signal;
389
390 while () {
391 next_job:
392 my $avail = cf::till_tick;
393 if ($avail > 0.01) {
394 for (0 .. $#SLOT_QUEUE) {
395 if ($SLOT_QUEUE[$_][0] < $avail) {
396 my $job = splice @SLOT_QUEUE, $_, 1, ();
397 $job->[2]->send;
398 Coro::cede;
399 goto next_job;
400 }
401 }
402 }
403
404 if (@SLOT_QUEUE) {
405 # we do not use wait_for_tick() as it returns immediately when tick is inactive
406 push @cf::WAIT_FOR_TICK, $signal;
407 $signal->wait;
408 } else {
409 Coro::schedule;
410 }
411 }
412};
413
414sub get_slot($;$$) {
415 my ($time, $pri, $name) = @_;
416
417 $time = $TICK * .6 if $time > $TICK * .6;
418 my $sig = new Coro::Signal;
419
420 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
421 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
422 $SLOT_QUEUE->ready;
423 $sig->wait;
424}
425
313=item cf::async { BLOCK } 426=item cf::async { BLOCK }
314 427
315Currently the same as Coro::async_pool, meaning you cannot use 428Currently the same as Coro::async_pool, meaning you cannot use
316C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 429C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
317thing you are allowed to do is call C<prio> on it. 430thing you are allowed to do is call C<prio> on it.
320 433
321BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
322 435
323=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
324 437
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 438The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 439is always able to handle events or runnable, as Deliantra is only
327partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 440partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable. 441acceptable.
329 442
330If 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
331the given BLOCK in another coroutine while waiting for the result. The 444the given BLOCK in another coroutine while waiting for the result. The
336 449
337sub sync_job(&) { 450sub sync_job(&) {
338 my ($job) = @_; 451 my ($job) = @_;
339 452
340 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
341 my $time = Event::time; 454 my $time = EV::time;
342 455
343 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
345 458
459 LOG llevError, Carp::longmess "sync job";#d#
460
346 # TODO: use suspend/resume instead 461 # TODO: use suspend/resume instead
347 # (but this is cancel-safe) 462 # (but this is cancel-safe)
348 my $freeze_guard = freeze_mainloop; 463 my $freeze_guard = freeze_mainloop;
349 464
350 my $busy = 1; 465 my $busy = 1;
351 my @res; 466 my @res;
352 467
353 (async { 468 (async {
469 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 470 @res = eval { $job->() };
355 warn $@ if $@; 471 warn $@ if $@;
356 undef $busy; 472 undef $busy;
357 })->prio (Coro::PRIO_MAX); 473 })->prio (Coro::PRIO_MAX);
358 474
359 while ($busy) { 475 while ($busy) {
360 Coro::cede or Event::one_event; 476 if (Coro::nready) {
477 Coro::cede_notself;
478 } else {
479 EV::loop EV::LOOP_ONESHOT;
361 } 480 }
481 }
362 482
363 $time = Event::time - $time; 483 $time = EV::time - $time;
364 484
365 LOG llevError | logBacktrace, Carp::longmess "long sync job" 485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367 487
368 $tick_start += $time; # do not account sync jobs to server load 488 $tick_start += $time; # do not account sync jobs to server load
398=item fork_call { }, $args 518=item fork_call { }, $args
399 519
400Executes the given code block with the given arguments in a seperate 520Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 521process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 522Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 523never block itself or use any form of event handling.
404 524
405=cut 525=cut
406 526
407sub fork_call(&@) { 527sub fork_call(&@) {
408 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
409 529
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 530 # we seemingly have to make a local copy of the whole thing,
411# or die "socketpair: $!"; 531 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 532 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 533
415 if (my $pid = fork) { 534 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 535 reset_signals;
428 local $SIG{__WARN__}; 536 &$cb
429 local $SIG{__DIE__}; 537 }, @args;
430 eval {
431 close $fh1;
432 538
433 my @res = eval { $cb->(@args) }; 539 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435 };
436
437 warn $@ if $@;
438 _exit 0;
439 }
440} 540}
441 541
442=item $value = cf::db_get $family => $key 542=item $value = cf::db_get $family => $key
443 543
444Returns a single value from the environment database. 544Returns a single value from the environment database.
446=item cf::db_put $family => $key => $value 546=item cf::db_put $family => $key => $value
447 547
448Stores 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
449data 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).
450 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
451=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}
452 574
453our $DB; 575our $DB;
454 576
455sub db_init { 577sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 578 cf::sync_job {
460 eval { 579 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 580 };
470} 581}
471 582
472sub db_get($$) { 583sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 584 my $key = "$_[0]/$_[1]";
474 585
524 if (1) { 635 if (1) {
525 $md5 = 636 $md5 =
526 join "\x00", 637 join "\x00",
527 $processversion, 638 $processversion,
528 map { 639 map {
529 Coro::cede; 640 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 641 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 642 } 0.. $#$src;
532 643
533 644
534 my $dbmd5 = db_get cache => "$id/md5"; 645 my $dbmd5 = db_get cache => "$id/md5";
578attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
580 691
581In 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>
582C<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
583Crossfire TRT). 694Deliantra).
584 695
585=over 4 696=over 4
586 697
587=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
588 699
840 "; 951 ";
841 die if $@; 952 die if $@;
842} 953}
843 954
844our $override; 955our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 956our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 957
847sub override { 958sub override {
848 $override = 1; 959 $override = 1;
849 @invoke_results = (); 960 @INVOKE_RESULTS = (@_);
850} 961}
851 962
852sub do_invoke { 963sub do_invoke {
853 my $event = shift; 964 my $event = shift;
854 my $callbacks = shift; 965 my $callbacks = shift;
855 966
856 @invoke_results = (); 967 @INVOKE_RESULTS = ();
857 968
858 local $override; 969 local $override;
859 970
860 for (@$callbacks) { 971 for (@$callbacks) {
861 eval { &{$_->[1]} }; 972 eval { &{$_->[1]} };
870 } 981 }
871 982
872 0 983 0
873} 984}
874 985
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 987
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 989
879Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
880 991
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 992This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 993removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 994results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 995
885=back 996=back
886 997
887=cut 998=cut
888 999
889############################################################################# 1000#############################################################################
890# object support 1001# object support
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#
1036sub _can_merge {
1037 my ($ob1, $ob2) = @_;
1038
1039 ++$SLOW_MERGES;#d#
1040
1041 # we do the slow way here
1042 return _object_equal $ob1, $ob2
1043}
891 1044
892sub reattach { 1045sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1047 my ($obj) = @_;
895 1048
916cf::attachable->attach ( 1069cf::attachable->attach (
917 prio => -1000000, 1070 prio => -1000000,
918 on_instantiate => sub { 1071 on_instantiate => sub {
919 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
920 1073
921 $data = from_json $data; 1074 $data = decode_json $data;
922 1075
923 for (@$data) { 1076 for (@$data) {
924 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
925 1078
926 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
942sub object_freezer_save { 1095sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1096 my ($filename, $rdata, $objs) = @_;
944 1097
945 sync_job { 1098 sync_job {
946 if (length $$rdata) { 1099 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1101 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1102 $decname, length $$rdata, scalar @$objs;
949 1103
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1107 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1108 close $fh;
955 1109
956 if (@$objs) { 1110 if (@$objs) {
957 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) {
958 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1116 close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
964 } 1118 }
972 } 1126 }
973 } else { 1127 } else {
974 aio_unlink $filename; 1128 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1129 aio_unlink "$filename.pst";
976 } 1130 }
977 } 1131 };
978} 1132}
979 1133
980sub object_freezer_as_string { 1134sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1135 my ($rdata, $objs) = @_;
982 1136
994 or return; 1148 or return;
995 1149
996 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
998 or return; 1152 or return;
1153
999 $av = eval { (Storable::thaw $av)->{objs} }; 1154 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs};
1000 } 1156 }
1001 1157
1158 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1160 $decname, length $data, scalar @{$av || []};
1161
1004 return ($data, $av); 1162 ($data, $av)
1005} 1163}
1006 1164
1007=head2 COMMAND CALLBACKS 1165=head2 COMMAND CALLBACKS
1008 1166
1009=over 4 1167=over 4
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1187 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1188}
1031 1189
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1190=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1191
1034Register a callback fro execution when the client sends an extcmd packet. 1192Register a callback for execution when the client sends an (synchronous)
1193extcmd packet. Ext commands will be processed in the order they are
1194received by the server, like other user commands. The first argument is
1195the logged-in player. Ext commands can only be processed after a player
1196has logged in successfully.
1035 1197
1036If the callback returns something, it is sent back as if reply was being 1198If the callback returns something, it is sent back as if reply was being
1037called. 1199called.
1038 1200
1201=item cf::register_exticmd $name => \&callback($ns,$packet);
1202
1203Register a callback for execution when the client sends an (asynchronous)
1204exticmd packet. Exti commands are processed by the server as soon as they
1205are received, i.e. out of order w.r.t. other commands. The first argument
1206is a client socket. Exti commands can be received anytime, even before
1207log-in.
1208
1209If the callback returns something, it is sent back as if reply was being
1210called.
1211
1039=cut 1212=cut
1040 1213
1041sub register_extcmd { 1214sub register_extcmd {
1042 my ($name, $cb) = @_; 1215 my ($name, $cb) = @_;
1043 1216
1044 $EXTCMD{$name} = $cb; 1217 $EXTCMD{$name} = $cb;
1218}
1219
1220sub register_exticmd {
1221 my ($name, $cb) = @_;
1222
1223 $EXTICMD{$name} = $cb;
1045} 1224}
1046 1225
1047cf::player->attach ( 1226cf::player->attach (
1048 on_command => sub { 1227 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1228 my ($pl, $name, $params) = @_;
1058 cf::override; 1237 cf::override;
1059 }, 1238 },
1060 on_extcmd => sub { 1239 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1240 my ($pl, $buf) = @_;
1062 1241
1063 my $msg = eval { from_json $buf }; 1242 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1243
1065 if (ref $msg) { 1244 if (ref $msg) {
1245 my ($type, $reply, @payload) =
1246 "ARRAY" eq ref $msg
1247 ? @$msg
1248 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1249
1250 my @reply;
1251
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1252 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1253 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1254 }
1255
1256 $pl->ext_reply ($reply, @reply)
1257 if $reply;
1258
1071 } else { 1259 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1260 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1261 }
1074 1262
1075 cf::override; 1263 cf::override;
1128 my $msg = $@ ? "$v->{path}: $@\n" 1316 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n"; 1317 : "$v->{base}: extension inactive.\n";
1130 1318
1131 if (exists $v->{meta}{mandatory}) { 1319 if (exists $v->{meta}{mandatory}) {
1132 warn $msg; 1320 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n"; 1321 cf::cleanup "mandatory extension failed to load, exiting.";
1134 exit 1;
1135 } 1322 }
1136 1323
1137 warn $msg; 1324 warn $msg;
1138 } 1325 }
1139 1326
1164use Coro::AIO; 1351use Coro::AIO;
1165 1352
1166=head3 cf::player 1353=head3 cf::player
1167 1354
1168=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}
1169 1370
1170=item cf::player::find $login 1371=item cf::player::find $login
1171 1372
1172Returns the given player object, loading it if necessary (might block). 1373Returns the given player object, loading it if necessary (might block).
1173 1374
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1410 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1411 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1412 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1413 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1414
1214 my $pl = load_pl path $login 1415 my $f = new_from_file cf::object::thawer path $login
1215 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;
1216 $cf::PLAYER{$login} = $pl 1422 $cf::PLAYER{$login} = $pl
1217 } 1423 }
1218 } 1424 }
1219} 1425}
1220 1426
1230 1436
1231 aio_mkdir playerdir $pl, 0770; 1437 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1438 $pl->{last_save} = $cf::RUNTIME;
1233 1439
1234 $pl->save_pl ($path); 1440 $pl->save_pl ($path);
1235 Coro::cede; 1441 cf::cede_to_tick;
1236} 1442}
1237 1443
1238sub new($) { 1444sub new($) {
1239 my ($login) = @_; 1445 my ($login) = @_;
1240 1446
1244 $self->{deny_save} = 1; 1450 $self->{deny_save} = 1;
1245 1451
1246 $cf::PLAYER{$login} = $self; 1452 $cf::PLAYER{$login} = $self;
1247 1453
1248 $self 1454 $self
1455}
1456
1457=item $player->send_msg ($channel, $msg, $color, [extra...])
1458
1459=cut
1460
1461sub send_msg {
1462 my $ns = shift->ns
1463 or return;
1464 $ns->send_msg (@_);
1249} 1465}
1250 1466
1251=item $pl->quit_character 1467=item $pl->quit_character
1252 1468
1253Nukes the player without looking back. If logged in, the connection will 1469Nukes the player without looking back. If logged in, the connection will
1308 or return []; 1524 or return [];
1309 1525
1310 my @logins; 1526 my @logins;
1311 1527
1312 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") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1533 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1534 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1535 $buf !~ /^password -------------$/m or next; # official not-valid tag
1536 }
1316 1537
1317 utf8::decode $login; 1538 utf8::decode $login;
1318 push @logins, $login; 1539 push @logins, $login;
1319 } 1540 }
1320 1541
1353 1574
1354Expand crossfire pod fragments into protocol xml. 1575Expand crossfire pod fragments into protocol xml.
1355 1576
1356=cut 1577=cut
1357 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
1358sub expand_cfpod { 1590sub expand_cfpod {
1359 ((my $self), (local $_)) = @_; 1591 my ($self, $pod) = @_;
1360 1592
1361 # escape & and < 1593 my $xml;
1362 s/&/&amp;/g;
1363 s/(?<![BIUGH])</&lt;/g;
1364 1594
1365 # this is buggy, it needs to properly take care of nested <'s 1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1366 1598
1367 1 while 1599 $group =~ s/&/&amp;/g;
1368 # replace B<>, I<>, U<> etc. 1600 $group =~ s/</&lt;/g;
1369 s/B<([^\>]*)>/<b>$1<\/b>/ 1601
1370 || s/I<([^\>]*)>/<i>$1<\/i>/ 1602 $xml .= $group;
1371 || s/U<([^\>]*)>/<u>$1<\/u>/ 1603 } elsif ($pod =~ m%\G
1372 # replace G<male|female> tags 1604 ([BCGHITU])
1373 || s{G<([^>|]*)\|([^>]*)>}{ 1605 <
1374 $self->gender ? $2 : $1 1606 (?:
1607 ([^<>]*) (?{ $group = $^N })
1608 | < $interior >
1609 )
1610 >
1611 %gcsx
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") {
1630 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1632 "")
1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1375 }ge 1642 }
1376 # replace H<hint text> 1643 }
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1378 1644
1645 for ($xml) {
1379 # create single paragraphs (very hackish) 1646 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g; 1647 s/(?<=\S)\n(?=\w)/ /g;
1381 1648
1382 $_ 1649 # compress some whitespace
1383} 1650 s/\s+\n/\n/g; # ws line-ends
1651 s/\n\n+/\n/g; # double lines
1652 s/^\n+//; # beginning lines
1653 s/\n+$//; # ending lines
1654 }
1384 1655
1656 $xml
1657}
1658
1659no re 'eval';
1660
1661sub hintmode {
1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1663 $_[0]{hintmode}
1664}
1665
1385=item $player->ext_reply ($msgid, %msg) 1666=item $player->ext_reply ($msgid, @msg)
1386 1667
1387Sends an ext reply to the player. 1668Sends an ext reply to the player.
1388 1669
1389=cut 1670=cut
1390 1671
1391sub ext_reply($$%) { 1672sub ext_reply($$@) {
1392 my ($self, $id, %msg) = @_; 1673 my ($self, $id, @msg) = @_;
1393 1674
1394 $msg{msgid} = $id; 1675 $self->ns->ext_reply ($id, @msg)
1395
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1676}
1398 1677
1399=item $player->ext_event ($type, %msg) 1678=item $player->ext_msg ($type, @msg)
1400 1679
1401Sends an ext event to the client. 1680Sends an ext event to the client.
1402 1681
1403=cut 1682=cut
1404 1683
1405sub ext_event($$%) { 1684sub ext_msg($$@) {
1406 my ($self, $type, %msg) = @_; 1685 my ($self, $type, @msg) = @_;
1407 1686
1408 $self->ns->ext_event ($type, %msg); 1687 $self->ns->ext_msg ($type, @msg);
1409} 1688}
1410 1689
1411=head3 cf::region 1690=head3 cf::region
1412 1691
1413=over 4 1692=over 4
1426 my ($path) = @_; 1705 my ($path) = @_;
1427 1706
1428 my ($match, $specificity); 1707 my ($match, $specificity);
1429 1708
1430 for my $region (list) { 1709 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1710 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1711 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1712 if $region->specificity > $specificity;
1434 } 1713 }
1435 } 1714 }
1436 1715
1556 $self->init; # pass $1 etc. 1835 $self->init; # pass $1 etc.
1557 return $self; 1836 return $self;
1558 } 1837 }
1559 } 1838 }
1560 1839
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 1840 Carp::cluck "unable to resolve path '$path' (base '$base').";
1562 () 1841 ()
1563} 1842}
1564 1843
1565sub init { 1844sub init {
1566 my ($self) = @_; 1845 my ($self) = @_;
1629 1908
1630sub load_header_from($) { 1909sub load_header_from($) {
1631 my ($self, $path) = @_; 1910 my ($self, $path) = @_;
1632 1911
1633 utf8::encode $path; 1912 utf8::encode $path;
1634 #aio_open $path, O_RDONLY, 0 1913 my $f = new_from_file cf::object::thawer $path
1635 # or return;
1636
1637 $self->_load_header ($path)
1638 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;
1639 1921
1640 $self->{load_path} = $path; 1922 $self->{load_path} = $path;
1641 1923
1642 1 1924 1
1643} 1925}
1697sub find { 1979sub find {
1698 my ($path, $origin) = @_; 1980 my ($path, $origin) = @_;
1699 1981
1700 $path = normalise $path, $origin && $origin->path; 1982 $path = normalise $path, $origin && $origin->path;
1701 1983
1984 cf::lock_wait "map_data:$path";#d#remove
1702 cf::lock_wait "map_find:$path"; 1985 cf::lock_wait "map_find:$path";
1703 1986
1704 $cf::MAP{$path} || do { 1987 $cf::MAP{$path} || do {
1705 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
1706 my $map = new_from_path cf::map $path 1991 my $map = new_from_path cf::map $path
1707 or return; 1992 or return;
1708 1993
1709 $map->{last_save} = $cf::RUNTIME; 1994 $map->{last_save} = $cf::RUNTIME;
1710 1995
1712 or return; 1997 or return;
1713 1998
1714 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715 # doing this can freeze the server in a sync job, obviously 2000 # doing this can freeze the server in a sync job, obviously
1716 #$cf::WAIT_FOR_TICK->wait; 2001 #$cf::WAIT_FOR_TICK->wait;
2002 undef $guard1;
2003 undef $guard2;
1717 $map->reset; 2004 $map->reset;
1718 undef $guard;
1719 return find $path; 2005 return find $path;
1720 } 2006 }
1721 2007
1722 $cf::MAP{$path} = $map 2008 $cf::MAP{$path} = $map
1723 } 2009 }
1732 local $self->{deny_reset} = 1; # loading can take a long time 2018 local $self->{deny_reset} = 1; # loading can take a long time
1733 2019
1734 my $path = $self->{path}; 2020 my $path = $self->{path};
1735 2021
1736 { 2022 {
1737 my $guard = cf::lock_acquire "map_load:$path"; 2023 my $guard = cf::lock_acquire "map_data:$path";
1738 2024
2025 return unless $self->valid;
1739 return if $self->in_memory != cf::MAP_SWAPPED; 2026 return unless $self->in_memory == cf::MAP_SWAPPED;
1740 2027
1741 $self->in_memory (cf::MAP_LOADING); 2028 $self->in_memory (cf::MAP_LOADING);
1742 2029
1743 $self->alloc; 2030 $self->alloc;
1744 2031
1745 $self->pre_load; 2032 $self->pre_load;
1746 Coro::cede; 2033 cf::cede_to_tick;
1747 2034
2035 my $f = new_from_file cf::object::thawer $self->{load_path};
2036 $f->skip_block;
1748 $self->_load_objects ($self->{load_path}, 1) 2037 $self->_load_objects ($f)
1749 or return; 2038 or return;
1750 2039
1751 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2040 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1752 if delete $self->{load_original}; 2041 if delete $self->{load_original};
1753 2042
1754 if (my $uniq = $self->uniq_path) { 2043 if (my $uniq = $self->uniq_path) {
1755 utf8::encode $uniq; 2044 utf8::encode $uniq;
1756 if (aio_open $uniq, O_RDONLY, 0) { 2045 unless (aio_stat $uniq) {
2046 if (my $f = new_from_file cf::object::thawer $uniq) {
1757 $self->clear_unique_items; 2047 $self->clear_unique_items;
1758 $self->_load_objects ($uniq, 0); 2048 $self->_load_objects ($f);
2049 $f->resolve_delayed_derefs;
2050 }
1759 } 2051 }
1760 } 2052 }
1761 2053
1762 Coro::cede; 2054 $f->resolve_delayed_derefs;
2055
2056 cf::cede_to_tick;
1763 # now do the right thing for maps 2057 # now do the right thing for maps
1764 $self->link_multipart_objects; 2058 $self->link_multipart_objects;
1765 $self->difficulty ($self->estimate_difficulty) 2059 $self->difficulty ($self->estimate_difficulty)
1766 unless $self->difficulty; 2060 unless $self->difficulty;
1767 Coro::cede; 2061 cf::cede_to_tick;
1768 2062
1769 unless ($self->{deny_activate}) { 2063 unless ($self->{deny_activate}) {
1770 $self->decay_objects; 2064 $self->decay_objects;
1771 $self->fix_auto_apply; 2065 $self->fix_auto_apply;
1772 $self->update_buttons; 2066 $self->update_buttons;
1773 Coro::cede; 2067 cf::cede_to_tick;
1774 $self->set_darkness_map; 2068 $self->set_darkness_map;
1775 Coro::cede; 2069 cf::cede_to_tick;
1776 $self->activate; 2070 $self->activate;
1777 } 2071 }
2072
2073 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME);
1778 2075
1779 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_IN_MEMORY);
1780 } 2077 }
1781 2078
1782 $self->post_load; 2079 $self->post_load;
1793 2090
1794 $self 2091 $self
1795} 2092}
1796 2093
1797# find and load all maps in the 3x3 area around a map 2094# find and load all maps in the 3x3 area around a map
1798sub load_diag { 2095sub load_neighbours {
1799 my ($map) = @_; 2096 my ($map) = @_;
1800 2097
1801 my @diag; # diagonal neighbours 2098 my @neigh; # diagonal neighbours
1802 2099
1803 for (0 .. 3) { 2100 for (0 .. 3) {
1804 my $neigh = $map->tile_path ($_) 2101 my $neigh = $map->tile_path ($_)
1805 or next; 2102 or next;
1806 $neigh = find $neigh, $map 2103 $neigh = find $neigh, $map
1807 or next; 2104 or next;
1808 $neigh->load; 2105 $neigh->load;
1809 2106
2107 push @neigh,
1810 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1811 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1812 } 2110 }
1813 2111
1814 for (@diag) { 2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
1815 my $neigh = find @$_ 2114 my $neigh = find $path, $origin
1816 or next; 2115 or next;
1817 $neigh->load; 2116 $neigh->load;
1818 } 2117 }
1819} 2118}
1820 2119
1825} 2124}
1826 2125
1827sub do_load_sync { 2126sub do_load_sync {
1828 my ($map) = @_; 2127 my ($map) = @_;
1829 2128
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main;
2131
1830 cf::sync_job { $map->load }; 2132 cf::sync_job { $map->load };
1831} 2133}
1832 2134
1833our %MAP_PREFETCH; 2135our %MAP_PREFETCH;
1834our $MAP_PREFETCHER = undef; 2136our $MAP_PREFETCHER = undef;
1835 2137
1836sub find_async { 2138sub find_async {
1837 my ($path, $origin) = @_; 2139 my ($path, $origin, $load) = @_;
1838 2140
1839 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
1840 2142
1841 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
1842 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1843 } 2145 }
1844 2146
1845 undef $MAP_PREFETCH{$path}; 2147 $MAP_PREFETCH{$path} |= $load;
2148
1846 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
1847 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
1849 my $map = find $path 2154 if (my $map = find $k) {
1850 or next;
1851 $map->load; 2155 $map->load if $v;
2156 }
1852 2157
1853 delete $MAP_PREFETCH{$path}; 2158 delete $MAP_PREFETCH{$k};
1854 } 2159 }
1855 } 2160 }
1856 undef $MAP_PREFETCHER; 2161 undef $MAP_PREFETCHER;
1857 }; 2162 };
1858 $MAP_PREFETCHER->prio (6); 2163 $MAP_PREFETCHER->prio (6);
1861} 2166}
1862 2167
1863sub save { 2168sub save {
1864 my ($self) = @_; 2169 my ($self) = @_;
1865 2170
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2172
1868 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
1869 2174
1870 return unless $self->dirty; 2175 return unless $self->dirty;
1871 2176
1877 return if $self->{deny_save}; 2182 return if $self->{deny_save};
1878 2183
1879 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
1880 2185
1881 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
1882 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
1883 }; 2189 };
1884 2190
1885 if ($uniq) { 2191 if ($uniq) {
1886 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1894 my ($self) = @_; 2200 my ($self) = @_;
1895 2201
1896 # save first because save cedes 2202 # save first because save cedes
1897 $self->save; 2203 $self->save;
1898 2204
1899 my $lock = cf::lock_acquire "map_data:" . $self->path; 2205 my $lock = cf::lock_acquire "map_data:$self->{path}";
1900 2206
1901 return if $self->players; 2207 return if $self->players;
1902 return if $self->in_memory != cf::MAP_IN_MEMORY; 2208 return if $self->in_memory != cf::MAP_IN_MEMORY;
1903 return if $self->{deny_save}; 2209 return if $self->{deny_save};
1904 2210
2211 $self->in_memory (cf::MAP_SWAPPED);
2212
2213 $self->deactivate;
2214 $_->clear_links_to ($self) for values %cf::MAP;
1905 $self->clear; 2215 $self->clear;
1906 $self->in_memory (cf::MAP_SWAPPED);
1907} 2216}
1908 2217
1909sub reset_at { 2218sub reset_at {
1910 my ($self) = @_; 2219 my ($self) = @_;
1911 2220
1943 if $uniq; 2252 if $uniq;
1944 } 2253 }
1945 2254
1946 delete $cf::MAP{$self->path}; 2255 delete $cf::MAP{$self->path};
1947 2256
2257 $self->deactivate;
2258 $_->clear_links_to ($self) for values %cf::MAP;
1948 $self->clear; 2259 $self->clear;
1949
1950 $_->clear_links_to ($self) for values %cf::MAP;
1951 2260
1952 $self->unlink_save; 2261 $self->unlink_save;
1953 $self->destroy; 2262 $self->destroy;
1954} 2263}
1955 2264
1956my $nuke_counter = "aaaa"; 2265my $nuke_counter = "aaaa";
1957 2266
1958sub nuke { 2267sub nuke {
1959 my ($self) = @_; 2268 my ($self) = @_;
1960 2269
2270 {
2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2272
1961 delete $cf::MAP{$self->path}; 2273 delete $cf::MAP{$self->path};
1962 2274
1963 $self->unlink_save; 2275 $self->unlink_save;
1964 2276
1965 bless $self, "cf::map"; 2277 bless $self, "cf::map";
1966 delete $self->{deny_reset}; 2278 delete $self->{deny_reset};
1967 $self->{deny_save} = 1; 2279 $self->{deny_save} = 1;
1968 $self->reset_timeout (1); 2280 $self->reset_timeout (1);
1969 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2281 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970 2282
1971 $cf::MAP{$self->path} = $self; 2283 $cf::MAP{$self->path} = $self;
2284 }
1972 2285
1973 $self->reset; # polite request, might not happen 2286 $self->reset; # polite request, might not happen
1974} 2287}
1975 2288
1976=item $maps = cf::map::tmp_maps 2289=item $maps = cf::map::tmp_maps
2052 2365
2053sub inv_recursive { 2366sub inv_recursive {
2054 inv_recursive_ inv $_[0] 2367 inv_recursive_ inv $_[0]
2055} 2368}
2056 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
2057package cf; 2398package cf;
2058 2399
2059=back 2400=back
2060 2401
2061=head3 cf::object::player 2402=head3 cf::object::player
2083 2424
2084 } else { 2425 } else {
2085 my $pl = $self->contr; 2426 my $pl = $self->contr;
2086 2427
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2428 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog}; 2429 my $dialog = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply ( 2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090 $diag->{id},
2091 msgtype => "reply",
2092 msg => $diag->{pl}->expand_cfpod ($msg),
2093 add_topics => []
2094 );
2095 2431
2096 } else { 2432 } else {
2097 $msg = $npc->name . " says: $msg" if $npc; 2433 $msg = $npc->name . " says: $msg" if $npc;
2098 $self->message ($msg, $flags); 2434 $self->message ($msg, $flags);
2099 } 2435 }
2100 } 2436 }
2437}
2438
2439=item $object->send_msg ($channel, $msg, $color, [extra...])
2440
2441=cut
2442
2443sub cf::object::send_msg {
2444 my $pl = shift->contr
2445 or return;
2446 $pl->send_msg (@_);
2101} 2447}
2102 2448
2103=item $player_object->may ("access") 2449=item $player_object->may ("access")
2104 2450
2105Returns wether the given player is authorized to access resource "access" 2451Returns wether the given player is authorized to access resource "access"
2184 # use -1 or undef as default coordinates, not 0, 0 2530 # use -1 or undef as default coordinates, not 0, 0
2185 ($x, $y) = ($map->enter_x, $map->enter_y) 2531 ($x, $y) = ($map->enter_x, $map->enter_y)
2186 if $x <=0 && $y <= 0; 2532 if $x <=0 && $y <= 0;
2187 2533
2188 $map->load; 2534 $map->load;
2189 $map->load_diag; 2535 $map->load_neighbours;
2190 2536
2191 return unless $self->contr->active; 2537 return unless $self->contr->active;
2192 $self->activate_recursive; 2538 $self->activate_recursive;
2193 2539
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2541 $self->enter_map ($map, $x, $y);
2196} 2542}
2197 2543
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199 2545
2200Moves the player to the given map-path and coordinates by first freezing 2546Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback 2547her, loading and preparing them map, calling the provided $check callback
2202that has to return the map if sucecssful, and then unfreezes the player on 2548that has to return the map if sucecssful, and then unfreezes the player on
2203the new (success) or old (failed) map position. 2549the new (success) or old (failed) map position. In either case, $done will
2550be called at the end of this process.
2204 2551
2205=cut 2552=cut
2206 2553
2207our $GOTOGEN; 2554our $GOTOGEN;
2208 2555
2209sub cf::object::player::goto { 2556sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2557 my ($self, $path, $x, $y, $check, $done) = @_;
2211 2558
2212 # do generation counting so two concurrent goto's will be executed in-order 2559 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2560 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2561
2215 $self->enter_link; 2562 $self->enter_link;
2216 2563
2217 (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
2218 my $map = eval { 2586 my $map = eval {
2219 my $map = cf::map::find $path; 2587 my $map = defined $path ? cf::map::find $path : undef;
2220 2588
2221 if ($map) { 2589 if ($map) {
2222 $map = $map->customise_for ($self); 2590 $map = $map->customise_for ($self);
2223 $map = $check->($map) if $check && $map; 2591 $map = $check->($map) if $check && $map;
2224 } else { 2592 } else {
2225 $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);
2226 } 2594 }
2227 2595
2228 $map 2596 $map
2229 }; 2597 };
2230 2598
2235 2603
2236 if ($gen == $self->{_goto_generation}) { 2604 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2605 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2606 $self->leave_link ($map, $x, $y);
2239 } 2607 }
2608
2609 $done->() if $done;
2240 })->prio (1); 2610 })->prio (1);
2241} 2611}
2242 2612
2243=item $player_object->enter_exit ($exit_object) 2613=item $player_object->enter_exit ($exit_object)
2244 2614
2281 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2282 } 2652 }
2283 2653
2284 $rmp->{random_seed} ||= $exit->random_seed; 2654 $rmp->{random_seed} ||= $exit->random_seed;
2285 2655
2286 my $data = cf::to_json $rmp; 2656 my $data = cf::encode_json $rmp;
2287 my $md5 = Digest::MD5::md5_hex $data; 2657 my $md5 = Digest::MD5::md5_hex $data;
2288 my $meta = "$RANDOMDIR/$md5.meta"; 2658 my $meta = "$RANDOMDIR/$md5.meta";
2289 2659
2290 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2291 aio_write $fh, 0, (length $data), $data, 0; 2661 aio_write $fh, 0, (length $data), $data, 0;
2313 my $hp = $exit->stats->hp; 2683 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp; 2684 my $sp = $exit->stats->sp;
2315 2685
2316 $self->enter_link; 2686 $self->enter_link;
2317 2687
2688 # if exit is damned, update players death & WoR home-position
2689 $self->contr->savebed ($slaying, $hp, $sp)
2690 if $exit->flag (FLAG_DAMNED);
2691
2318 (async { 2692 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2694
2319 $self->deactivate_recursive; # just to be sure 2695 $self->deactivate_recursive; # just to be sure
2320 unless (eval { 2696 unless (eval {
2321 $self->goto ($slaying, $hp, $sp); 2697 $self->goto ($slaying, $hp, $sp);
2322 2698
2323 1; 2699 1;
2349 2725
2350 utf8::encode $text; 2726 utf8::encode $text;
2351 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2727 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352} 2728}
2353 2729
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 2730=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 2731
2356Send a drawinfo or msg packet to the client, formatting the msg for the 2732Send a drawinfo or msg packet to the client, formatting the msg for the
2357client if neccessary. C<$type> should be a string identifying the type of 2733client if neccessary. C<$type> should be a string identifying the type of
2358the message, with C<log> being the default. If C<$color> is negative, suppress 2734the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet. 2735the message unless the client supports the msg packet.
2360 2736
2361=cut 2737=cut
2362 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
2363sub cf::client::send_msg { 2791sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2792 my ($self, $channel, $msg, $color, @extra) = @_;
2365 2793
2366 $msg = $self->pl->expand_cfpod ($msg); 2794 $msg = $self->pl->expand_cfpod ($msg);
2367 2795
2796 $color &= cf::NDI_CLIENT_MASK; # just in case...
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
2807 } elsif (ref $channel) {
2808 # send meta info to client, if not yet sent
2809 unless (exists $self->{channel}{$channel->{id}}) {
2810 $self->{channel}{$channel->{id}} = $channel;
2811 $self->ext_msg (channel_info => $channel)
2812 if $self->can_msg;
2813 }
2814
2815 $channel = $channel->{id};
2816 }
2817
2818 return unless @extra || length $msg;
2819
2368 if ($self->can_msg) { 2820 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2821 # default colour, mask it out
2822 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2823 if $color & cf::NDI_DEF;
2824
2825 $self->send_packet ("msg " . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2370 } else { 2827 } else {
2371 # replace some tags by gcfclient-compatible ones
2372 for ($msg) {
2373 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/;
2379 }
2380
2381 if ($color >= 0) { 2828 if ($color >= 0) {
2829 # replace some tags by gcfclient-compatible ones
2830 for ($msg) {
2831 1 while
2832 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2833 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2834 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2835 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2836 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2837 }
2838
2839 $color &= cf::NDI_COLOR_MASK;
2840
2841 utf8::encode $msg;
2842
2382 if ($msg =~ /\[/) { 2843 if (0 && $msg =~ /\[/) {
2844 # COMMAND/INFO
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2845 $self->send_packet ("drawextinfo $color 10 8 $msg")
2384 } else { 2846 } else {
2847 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2385 $self->send_packet ("drawinfo $color $msg") 2848 $self->send_packet ("drawinfo $color $msg")
2386 } 2849 }
2387 } 2850 }
2388 } 2851 }
2389} 2852}
2390 2853
2391=item $client->ext_event ($type, %msg) 2854=item $client->ext_msg ($type, @msg)
2392 2855
2393Sends an exti event to the client. 2856Sends an ext event to the client.
2394 2857
2395=cut 2858=cut
2396 2859
2397sub cf::client::ext_event($$%) { 2860sub cf::client::ext_msg($$@) {
2398 my ($self, $type, %msg) = @_; 2861 my ($self, $type, @msg) = @_;
2399 2862
2863 if ($self->extcmd == 2) {
2864 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2865 } elsif ($self->extcmd == 1) { # TODO: remove
2400 $msg{msgtype} = "event_$type"; 2866 push @msg, msgtype => "event_$type";
2401 $self->send_packet ("ext " . cf::to_json \%msg); 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;
2885 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2886 }
2402} 2887}
2403 2888
2404=item $success = $client->query ($flags, "text", \&cb) 2889=item $success = $client->query ($flags, "text", \&cb)
2405 2890
2406Queues a query to the client, calling the given callback with 2891Queues a query to the client, calling the given callback with
2407the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2892the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2408C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2893C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2409 2894
2410Queries can fail, so check the return code. Or don't, as queries will become 2895Queries can fail, so check the return code. Or don't, as queries will
2411reliable at some point in the future. 2896become reliable at some point in the future.
2412 2897
2413=cut 2898=cut
2414 2899
2415sub cf::client::query { 2900sub cf::client::query {
2416 my ($self, $flags, $text, $cb) = @_; 2901 my ($self, $flags, $text, $cb) = @_;
2424 utf8::encode $text; 2909 utf8::encode $text;
2425 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2910 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2426 2911
2427 $self->send_packet ($self->{query_queue}[0][0]) 2912 $self->send_packet ($self->{query_queue}[0][0])
2428 if @{ $self->{query_queue} } == 1; 2913 if @{ $self->{query_queue} } == 1;
2914
2915 1
2429} 2916}
2430 2917
2431cf::client->attach ( 2918cf::client->attach (
2919 on_connect => sub {
2920 my ($ns) = @_;
2921
2922 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2923 },
2432 on_reply => sub { 2924 on_reply => sub {
2433 my ($ns, $msg) = @_; 2925 my ($ns, $msg) = @_;
2434 2926
2435 # this weird shuffling is so that direct followup queries 2927 # this weird shuffling is so that direct followup queries
2436 # get handled first 2928 # get handled first
2448 } else { 2940 } else {
2449 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2941 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2450 } 2942 }
2451 } 2943 }
2452 }, 2944 },
2945 on_exticmd => sub {
2946 my ($ns, $buf) = @_;
2947
2948 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2949
2950 if (ref $msg) {
2951 my ($type, $reply, @payload) =
2952 "ARRAY" eq ref $msg
2953 ? @$msg
2954 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2955
2956 my @reply;
2957
2958 if (my $cb = $EXTICMD{$type}) {
2959 @reply = $cb->($ns, @payload);
2960 }
2961
2962 $ns->ext_reply ($reply, @reply)
2963 if $reply;
2964
2965 } else {
2966 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2967 }
2968
2969 cf::override;
2970 },
2453); 2971);
2454 2972
2455=item $client->async (\&cb) 2973=item $client->async (\&cb)
2456 2974
2457Create a new coroutine, running the specified callback. The coroutine will 2975Create a new coroutine, running the specified callback. The coroutine will
2498our $safe = new Safe "safe"; 3016our $safe = new Safe "safe";
2499our $safe_hole = new Safe::Hole; 3017our $safe_hole = new Safe::Hole;
2500 3018
2501$SIG{FPE} = 'IGNORE'; 3019$SIG{FPE} = 'IGNORE';
2502 3020
2503$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3021$safe->permit_only (Opcode::opset qw(
3022 :base_core :base_mem :base_orig :base_math
3023 grepstart grepwhile mapstart mapwhile
3024 sort time
3025));
2504 3026
2505# here we export the classes and methods available to script code 3027# here we export the classes and methods available to script code
2506 3028
2507=pod 3029=pod
2508 3030
2509The following functions and methods are available within a safe environment: 3031The following functions and methods are available within a safe environment:
2510 3032
2511 cf::object contr pay_amount pay_player map 3033 cf::object
3034 contr pay_amount pay_player map x y force_find force_add destroy
3035 insert remove name archname title slaying race decrease_ob_nr
3036
2512 cf::object::player player 3037 cf::object::player
2513 cf::player peaceful 3038 player
2514 cf::map trigger 3039
3040 cf::player
3041 peaceful
3042
3043 cf::map
3044 trigger
2515 3045
2516=cut 3046=cut
2517 3047
2518for ( 3048for (
2519 ["cf::object" => qw(contr pay_amount pay_player map)], 3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3050 insert remove inv name archname title slaying race
3051 decrease_ob_nr destroy)],
2520 ["cf::object::player" => qw(player)], 3052 ["cf::object::player" => qw(player)],
2521 ["cf::player" => qw(peaceful)], 3053 ["cf::player" => qw(peaceful)],
2522 ["cf::map" => qw(trigger)], 3054 ["cf::map" => qw(trigger)],
2523) { 3055) {
2524 no strict 'refs'; 3056 no strict 'refs';
2600# the server's init and main functions 3132# the server's init and main functions
2601 3133
2602sub load_facedata($) { 3134sub load_facedata($) {
2603 my ($path) = @_; 3135 my ($path) = @_;
2604 3136
3137 # HACK to clear player env face cache, we need some signal framework
3138 # for this (global event?)
3139 %ext::player_env::MUSIC_FACE_CACHE = ();
3140
3141 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3142
2605 warn "loading facedata from $path\n"; 3143 warn "loading facedata from $path\n";
2606 3144
2607 my $facedata; 3145 my $facedata;
2608 0 < aio_load $path, $facedata 3146 0 < aio_load $path, $facedata
2609 or die "$path: $!"; 3147 or die "$path: $!";
2611 $facedata = Coro::Storable::thaw $facedata; 3149 $facedata = Coro::Storable::thaw $facedata;
2612 3150
2613 $facedata->{version} == 2 3151 $facedata->{version} == 2
2614 or cf::cleanup "$path: version mismatch, cannot proceed."; 3152 or cf::cleanup "$path: version mismatch, cannot proceed.";
2615 3153
3154 # patch in the exptable
3155 $facedata->{resource}{"res/exp_table"} = {
3156 type => FT_RSRC,
3157 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3158 };
3159 cf::cede_to_tick;
3160
2616 { 3161 {
2617 my $faces = $facedata->{faceinfo}; 3162 my $faces = $facedata->{faceinfo};
2618 3163
2619 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
2620 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3165 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166
2621 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3167 cf::face::set_visibility $idx, $info->{visibility};
3168 cf::face::set_magicmap $idx, $info->{magicmap};
2622 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3169 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2623 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3170 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2624 Coro::cede; 3171
3172 cf::cede_to_tick;
2625 } 3173 }
2626 3174
2627 while (my ($face, $info) = each %$faces) { 3175 while (my ($face, $info) = each %$faces) {
2628 next unless $info->{smooth}; 3176 next unless $info->{smooth};
3177
2629 my $idx = cf::face::find $face 3178 my $idx = cf::face::find $face
2630 or next; 3179 or next;
3180
2631 if (my $smooth = cf::face::find $info->{smooth}) { 3181 if (my $smooth = cf::face::find $info->{smooth}) {
3182 cf::face::set_smooth $idx, $smooth;
2632 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3183 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2633 } else { 3184 } else {
2634 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3185 warn "smooth face '$info->{smooth}' not found for face '$face'";
2635 } 3186 }
2636 Coro::cede; 3187
3188 cf::cede_to_tick;
2637 } 3189 }
2638 } 3190 }
2639 3191
2640 { 3192 {
2641 my $anims = $facedata->{animinfo}; 3193 my $anims = $facedata->{animinfo};
2642 3194
2643 while (my ($anim, $info) = each %$anims) { 3195 while (my ($anim, $info) = each %$anims) {
2644 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3196 cf::anim::set $anim, $info->{frames}, $info->{facings};
2645 Coro::cede; 3197 cf::cede_to_tick;
2646 } 3198 }
2647 3199
2648 cf::anim::invalidate_all; # d'oh 3200 cf::anim::invalidate_all; # d'oh
2649 } 3201 }
2650 3202
3203 {
3204 # TODO: for gcfclient pleasure, we should give resources
3205 # that gcfclient doesn't grok a >10000 face index.
3206 my $res = $facedata->{resource};
3207
3208 while (my ($name, $info) = each %$res) {
3209 if (defined $info->{type}) {
3210 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3211 my $data;
3212
3213 if ($info->{type} & 1) {
3214 # prepend meta info
3215
3216 my $meta = $enc->encode ({
3217 name => $name,
3218 %{ $info->{meta} || {} },
3219 });
3220
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;
3230 }
3231
3232 cf::cede_to_tick;
3233 }
3234 }
3235
3236 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3237
2651 1 3238 1
2652} 3239}
2653 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});
3260
3261register_exticmd fx_want => sub {
3262 my ($ns, $want) = @_;
3263
3264 while (my ($k, $v) = each %$want) {
3265 $ns->fx_want ($k, $v);
3266 }
3267};
3268
2654sub 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
2655 load_resource_file "$MAPDIR/regions" 3274 load_resource_file "$MAPDIR/regions"
2656 or die "unable to load regions file\n"; 3275 or die "unable to load regions file\n";
3276
3277 for (cf::region::list) {
3278 $_->{match} = qr/$_->{match}/
3279 if exists $_->{match};
3280 }
2657} 3281}
2658 3282
2659sub reload_facedata { 3283sub reload_facedata {
2660 load_facedata "$DATADIR/facedata" 3284 load_facedata "$DATADIR/facedata"
2661 or die "unable to load facedata\n"; 3285 or die "unable to load facedata\n";
2662} 3286}
2663 3287
2664sub reload_archetypes { 3288sub reload_archetypes {
3289 load_resource_file "$DATADIR/archetypes"
3290 or die "unable to load archetypes\n";
3291 #d# NEED to laod twice to resolve forward references
3292 # this really needs to be done in an extra post-pass
3293 # (which needs to be synchronous, so solve it differently)
2665 load_resource_file "$DATADIR/archetypes" 3294 load_resource_file "$DATADIR/archetypes"
2666 or die "unable to load archetypes\n"; 3295 or die "unable to load archetypes\n";
2667} 3296}
2668 3297
2669sub reload_treasures { 3298sub reload_treasures {
2685 3314
2686sub init { 3315sub init {
2687 reload_resources; 3316 reload_resources;
2688} 3317}
2689 3318
2690sub cfg_load { 3319sub reload_config {
2691 open my $fh, "<:utf8", "$CONFDIR/config" 3320 open my $fh, "<:utf8", "$CONFDIR/config"
2692 or return; 3321 or return;
2693 3322
2694 local $/; 3323 local $/;
2695 *CFG = YAML::Syck::Load <$fh>; 3324 *CFG = YAML::Load <$fh>;
2696 3325
2697 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2698 3327
2699 $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};
2700 $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};
2711sub main { 3340sub main {
2712 # we must not ever block the main coroutine 3341 # we must not ever block the main coroutine
2713 local $Coro::idle = sub { 3342 local $Coro::idle = sub {
2714 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#
2715 (async { 3344 (async {
2716 Event::one_event; 3345 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT;
2717 })->prio (Coro::PRIO_MAX); 3347 })->prio (Coro::PRIO_MAX);
2718 }; 3348 };
2719 3349
2720 cfg_load; 3350 reload_config;
2721 db_init; 3351 db_init;
2722 load_extensions; 3352 load_extensions;
2723 3353
2724 $TICK_WATCHER->start; 3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2725 Event::loop; 3356 EV::loop;
2726} 3357}
2727 3358
2728############################################################################# 3359#############################################################################
2729# initialisation and cleanup 3360# initialisation and cleanup
2730 3361
2731# install some emergency cleanup handlers 3362# install some emergency cleanup handlers
2732BEGIN { 3363BEGIN {
3364 our %SIGWATCHER = ();
2733 for my $signal (qw(INT HUP TERM)) { 3365 for my $signal (qw(INT HUP TERM)) {
2734 Event->signal ( 3366 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2735 reentrant => 0,
2736 data => WF_AUTOCANCEL,
2737 signal => $signal,
2738 prio => 0,
2739 cb => sub {
2740 cf::cleanup "SIG$signal"; 3367 cf::cleanup "SIG$signal";
2741 },
2742 ); 3368 };
2743 } 3369 }
2744} 3370}
2745 3371
2746sub write_runtime { 3372sub write_runtime {
2747 my $runtime = "$LOCALDIR/runtime"; 3373 my $runtime = "$LOCALDIR/runtime";
2792 # and maps saved/destroyed asynchronously. 3418 # and maps saved/destroyed asynchronously.
2793 warn "begin emergency player save\n"; 3419 warn "begin emergency player save\n";
2794 for my $login (keys %cf::PLAYER) { 3420 for my $login (keys %cf::PLAYER) {
2795 my $pl = $cf::PLAYER{$login} or next; 3421 my $pl = $cf::PLAYER{$login} or next;
2796 $pl->valid or next; 3422 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2797 $pl->save; 3424 $pl->save;
2798 } 3425 }
2799 warn "end emergency player save\n"; 3426 warn "end emergency player save\n";
2800 3427
2801 warn "begin emergency map save\n"; 3428 warn "begin emergency map save\n";
2840 warn "syncing database to disk"; 3467 warn "syncing database to disk";
2841 BDB::db_env_txn_checkpoint $DB_ENV; 3468 BDB::db_env_txn_checkpoint $DB_ENV;
2842 3469
2843 # 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
2844 3471
2845 warn "cancelling all WF_AUTOCANCEL watchers";
2846 for (Event::all_watchers) {
2847 $_->cancel if $_->data & WF_AUTOCANCEL;
2848 }
2849
2850 warn "flushing outstanding aio requests"; 3472 warn "flushing outstanding aio requests";
2851 for (;;) { 3473 for (;;) {
2852 BDB::flush; 3474 BDB::flush;
2853 IO::AIO::flush; 3475 IO::AIO::flush;
2854 Coro::cede; 3476 Coro::cede_notself;
2855 last unless IO::AIO::nreqs || BDB::nreqs; 3477 last unless IO::AIO::nreqs || BDB::nreqs;
2856 warn "iterate..."; 3478 warn "iterate...";
2857 } 3479 }
2858 3480
2859 ++$RELOAD; 3481 ++$RELOAD;
2863 %EXT_CORO = (); 3485 %EXT_CORO = ();
2864 3486
2865 warn "removing commands"; 3487 warn "removing commands";
2866 %COMMAND = (); 3488 %COMMAND = ();
2867 3489
2868 warn "removing ext commands"; 3490 warn "removing ext/exti commands";
2869 %EXTCMD = (); 3491 %EXTCMD = ();
3492 %EXTICMD = ();
2870 3493
2871 warn "unloading/nuking all extensions"; 3494 warn "unloading/nuking all extensions";
2872 for my $pkg (@EXTS) { 3495 for my $pkg (@EXTS) {
2873 warn "... unloading $pkg"; 3496 warn "... unloading $pkg";
2874 3497
2917 warn "reloading cf.pm"; 3540 warn "reloading cf.pm";
2918 require cf; 3541 require cf;
2919 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3542 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2920 3543
2921 warn "loading config and database again"; 3544 warn "loading config and database again";
2922 cf::cfg_load; 3545 cf::reload_config;
2923 3546
2924 warn "loading extensions"; 3547 warn "loading extensions";
2925 cf::load_extensions; 3548 cf::load_extensions;
2926 3549
2927 warn "reattaching attachments to objects/players"; 3550 warn "reattaching attachments to objects/players";
2934 warn "leaving sync_job"; 3557 warn "leaving sync_job";
2935 3558
2936 1 3559 1
2937 } or do { 3560 } or do {
2938 warn $@; 3561 warn $@;
2939 warn "error while reloading, exiting."; 3562 cf::cleanup "error while reloading, exiting.";
2940 exit 1;
2941 }; 3563 };
2942 3564
2943 warn "reloaded"; 3565 warn "reloaded";
2944}; 3566};
2945 3567
2947 3569
2948sub reload_perl() { 3570sub reload_perl() {
2949 # doing reload synchronously and two reloads happen back-to-back, 3571 # doing reload synchronously and two reloads happen back-to-back,
2950 # coro crashes during coro_state_free->destroy here. 3572 # coro crashes during coro_state_free->destroy here.
2951 3573
2952 $RELOAD_WATCHER ||= Event->timer ( 3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2953 reentrant => 0,
2954 after => 0,
2955 data => WF_AUTOCANCEL,
2956 cb => sub {
2957 do_reload_perl; 3575 do_reload_perl;
2958 undef $RELOAD_WATCHER; 3576 undef $RELOAD_WATCHER;
2959 },
2960 ); 3577 };
2961} 3578}
2962 3579
2963register_command "reload" => sub { 3580register_command "reload" => sub {
2964 my ($who, $arg) = @_; 3581 my ($who, $arg) = @_;
2965 3582
2966 if ($who->flag (FLAG_WIZ)) { 3583 if ($who->flag (FLAG_WIZ)) {
2967 $who->message ("reloading server."); 3584 $who->message ("reloading server.");
3585 async {
3586 $Coro::current->{desc} = "perl_reload";
2968 async { reload_perl }; 3587 reload_perl;
3588 };
2969 } 3589 }
2970}; 3590};
2971 3591
2972unshift @INC, $LIBDIR; 3592unshift @INC, $LIBDIR;
2973 3593
2992 my $signal = new Coro::Signal; 3612 my $signal = new Coro::Signal;
2993 push @WAIT_FOR_TICK_BEGIN, $signal; 3613 push @WAIT_FOR_TICK_BEGIN, $signal;
2994 $signal->wait; 3614 $signal->wait;
2995} 3615}
2996 3616
2997 my $min = 1e6;#d# 3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
2998 my $avg = 10;
2999$TICK_WATCHER = Event->timer (
3000 reentrant => 0,
3001 parked => 1,
3002 prio => 0,
3003 at => $NEXT_TICK || $TICK,
3004 data => WF_AUTOCANCEL,
3005 cb => sub {
3006 if ($Coro::current != $Coro::main) { 3618 if ($Coro::current != $Coro::main) {
3007 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"
3008 unless ++$bug_warning > 10; 3620 unless ++$bug_warning > 10;
3009 return; 3621 return;
3010 } 3622 }
3011 3623
3012 $NOW = $tick_start = Event::time; 3624 $NOW = $tick_start = EV::now;
3013 3625
3014 cf::server_tick; # one server iteration 3626 cf::server_tick; # one server iteration
3015 3627
3016 0 && sync_job {#d# 3628 $RUNTIME += $TICK;
3017 for(1..10) { 3629 $NEXT_TICK = $_[0]->at;
3018 my $t = Event::time;
3019 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3020 or die;
3021 3630
3022 $map->width (50); 3631 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3023 $map->height (50); 3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3024 $map->alloc; 3633 Coro::async_pool {
3025 $map->_load_objects ("/tmp/x.map", 1); 3634 $Coro::current->{desc} = "runtime saver";
3026 my $t = Event::time - $t; 3635 write_runtime
3027 3636 or warn "ERROR: unable to write runtime file: $!";
3028 #next unless $t < 0.0013;#d#
3029 if ($t < $min) {
3030 $min = $t;
3031 }
3032 $avg = $avg * 0.99 + $t * 0.01;
3033 }
3034 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3035 exit 0;
3036 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3037 }; 3637 };
3638 }
3038 3639
3039 $RUNTIME += $TICK;
3040 $NEXT_TICK += $TICK;
3041
3042 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3043 $NEXT_RUNTIME_WRITE = $NOW + 10;
3044 Coro::async_pool {
3045 write_runtime
3046 or warn "ERROR: unable to write runtime file: $!";
3047 };
3048 }
3049
3050# my $AFTER = Event::time;
3051# warn $AFTER - $NOW;#d#
3052
3053 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3054 $sig->send; 3641 $sig->send;
3055 } 3642 }
3056 while (my $sig = shift @WAIT_FOR_TICK) { 3643 while (my $sig = shift @WAIT_FOR_TICK) {
3057 $sig->send; 3644 $sig->send;
3058 } 3645 }
3059 3646
3060 $NOW = Event::time;
3061
3062 # if we are delayed by four ticks or more, skip them all
3063 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3064
3065 $TICK_WATCHER->at ($NEXT_TICK);
3066 $TICK_WATCHER->start;
3067
3068 $LOAD = ($NOW - $tick_start) / $TICK; 3647 $LOAD = ($NOW - $tick_start) / $TICK;
3069 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3070 3649
3071 _post_tick; 3650 _post_tick;
3072 3651};
3073 3652$TICK_WATCHER->priority (EV::MAXPRI);
3074 },
3075);
3076 3653
3077{ 3654{
3078 BDB::max_poll_time $TICK * 0.1; 3655 # configure BDB
3079 $BDB_POLL_WATCHER = Event->io ( 3656
3080 reentrant => 0,
3081 fd => BDB::poll_fileno,
3082 poll => 'r',
3083 prio => 0,
3084 data => WF_AUTOCANCEL,
3085 cb => \&BDB::poll_cb,
3086 );
3087 BDB::min_parallel 8; 3657 BDB::min_parallel 8;
3088 3658 BDB::max_poll_reqs $TICK * 0.1;
3089 BDB::set_sync_prepare { 3659 $Coro::BDB::WATCHER->priority (1);
3090 my $status;
3091 my $current = $Coro::current;
3092 (
3093 sub {
3094 $status = $!;
3095 $current->ready; undef $current;
3096 },
3097 sub {
3098 Coro::schedule while defined $current;
3099 $! = $status;
3100 },
3101 )
3102 };
3103 3660
3104 unless ($DB_ENV) { 3661 unless ($DB_ENV) {
3105 $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);
3106 3667
3107 cf::sync_job { 3668 cf::sync_job {
3108 eval { 3669 eval {
3109 BDB::db_env_open 3670 BDB::db_env_open
3110 $DB_ENV, 3671 $DB_ENV,
3112 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
3113 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3674 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3114 0666; 3675 0666;
3115 3676
3116 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3677 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3117
3118 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3119 $DB_ENV->set_lk_detect;
3120 }; 3678 };
3121 3679
3122 cf::cleanup "db_env_open(db): $@" if $@; 3680 cf::cleanup "db_env_open(db): $@" if $@;
3123 }; 3681 };
3124 } 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 };
3125} 3693}
3126 3694
3127{ 3695{
3696 # configure IO::AIO
3697
3128 IO::AIO::min_parallel 8; 3698 IO::AIO::min_parallel 8;
3129
3130 undef $Coro::AIO::WATCHER;
3131 IO::AIO::max_poll_time $TICK * 0.1; 3699 IO::AIO::max_poll_time $TICK * 0.1;
3132 $AIO_POLL_WATCHER = Event->io ( 3700 $Coro::AIO::WATCHER->priority (1);
3133 reentrant => 0,
3134 data => WF_AUTOCANCEL,
3135 fd => IO::AIO::poll_fileno,
3136 poll => 'r',
3137 prio => 6,
3138 cb => \&IO::AIO::poll_cb,
3139 );
3140} 3701}
3141 3702
3142my $_log_backtrace; 3703my $_log_backtrace;
3143 3704
3144sub _log_backtrace { 3705sub _log_backtrace {
3148 3709
3149 # limit the # of concurrent backtraces 3710 # limit the # of concurrent backtraces
3150 if ($_log_backtrace < 2) { 3711 if ($_log_backtrace < 2) {
3151 ++$_log_backtrace; 3712 ++$_log_backtrace;
3152 async { 3713 async {
3714 $Coro::current->{desc} = "abt $msg";
3715
3153 my @bt = fork_call { 3716 my @bt = fork_call {
3154 @addr = map { sprintf "%x", $_ } @addr; 3717 @addr = map { sprintf "%x", $_ } @addr;
3155 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3718 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3156 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 |"
3157 or die "addr2line: $!"; 3720 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines