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.286 by root, Sun Jun 24 04:27:20 2007 UTC vs.
Revision 1.410 by root, Tue Jan 15 12:02:24 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;
1165 1353
1166=head3 cf::player 1354=head3 cf::player
1167 1355
1168=over 4 1356=over 4
1169 1357
1358=item cf::player::num_playing
1359
1360Returns the official number of playing players, as per the Crossfire metaserver rules.
1361
1362=cut
1363
1364sub num_playing {
1365 scalar grep
1366 $_->ob->map
1367 && !$_->hidden
1368 && !$_->ob->flag (cf::FLAG_WIZ),
1369 cf::player::list
1370}
1371
1170=item cf::player::find $login 1372=item cf::player::find $login
1171 1373
1172Returns the given player object, loading it if necessary (might block). 1374Returns the given player object, loading it if necessary (might block).
1173 1375
1174=cut 1376=cut
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1411 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1412 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1413 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1414 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1415
1214 my $pl = load_pl path $login 1416 my $f = new_from_file cf::object::thawer path $login
1215 or return; 1417 or return;
1418
1419 my $pl = cf::player::load_pl $f
1420 or return;
1421 local $cf::PLAYER_LOADING{$login} = $pl;
1422 $f->resolve_delayed_derefs;
1216 $cf::PLAYER{$login} = $pl 1423 $cf::PLAYER{$login} = $pl
1217 } 1424 }
1218 } 1425 }
1219} 1426}
1220 1427
1230 1437
1231 aio_mkdir playerdir $pl, 0770; 1438 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1439 $pl->{last_save} = $cf::RUNTIME;
1233 1440
1234 $pl->save_pl ($path); 1441 $pl->save_pl ($path);
1235 Coro::cede; 1442 cf::cede_to_tick;
1236} 1443}
1237 1444
1238sub new($) { 1445sub new($) {
1239 my ($login) = @_; 1446 my ($login) = @_;
1240 1447
1244 $self->{deny_save} = 1; 1451 $self->{deny_save} = 1;
1245 1452
1246 $cf::PLAYER{$login} = $self; 1453 $cf::PLAYER{$login} = $self;
1247 1454
1248 $self 1455 $self
1456}
1457
1458=item $player->send_msg ($channel, $msg, $color, [extra...])
1459
1460=cut
1461
1462sub send_msg {
1463 my $ns = shift->ns
1464 or return;
1465 $ns->send_msg (@_);
1249} 1466}
1250 1467
1251=item $pl->quit_character 1468=item $pl->quit_character
1252 1469
1253Nukes the player without looking back. If logged in, the connection will 1470Nukes the player without looking back. If logged in, the connection will
1308 or return []; 1525 or return [];
1309 1526
1310 my @logins; 1527 my @logins;
1311 1528
1312 for my $login (@$dirs) { 1529 for my $login (@$dirs) {
1530 my $path = path $login;
1531
1532 # a .pst is a dead give-away for a valid player
1533 unless (-e "$path.pst") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1535 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1536 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 }
1316 1538
1317 utf8::decode $login; 1539 utf8::decode $login;
1318 push @logins, $login; 1540 push @logins, $login;
1319 } 1541 }
1320 1542
1353 1575
1354Expand crossfire pod fragments into protocol xml. 1576Expand crossfire pod fragments into protocol xml.
1355 1577
1356=cut 1578=cut
1357 1579
1580use re 'eval';
1581
1582my $group;
1583my $interior; $interior = qr{
1584 # match a pod interior sequence sans C<< >>
1585 (?:
1586 \ (.*?)\ (?{ $group = $^N })
1587 | < (??{$interior}) >
1588 )
1589}x;
1590
1358sub expand_cfpod { 1591sub expand_cfpod {
1359 ((my $self), (local $_)) = @_; 1592 my ($self, $pod) = @_;
1360 1593
1361 # escape & and < 1594 my $xml;
1362 s/&/&amp;/g;
1363 s/(?<![BIUGH])</&lt;/g;
1364 1595
1365 # this is buggy, it needs to properly take care of nested <'s 1596 while () {
1597 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1598 $group = $1;
1366 1599
1367 1 while 1600 $group =~ s/&/&amp;/g;
1368 # replace B<>, I<>, U<> etc. 1601 $group =~ s/</&lt;/g;
1369 s/B<([^\>]*)>/<b>$1<\/b>/ 1602
1370 || s/I<([^\>]*)>/<i>$1<\/i>/ 1603 $xml .= $group;
1371 || s/U<([^\>]*)>/<u>$1<\/u>/ 1604 } elsif ($pod =~ m%\G
1372 # replace G<male|female> tags 1605 ([BCGHITU])
1373 || s{G<([^>|]*)\|([^>]*)>}{ 1606 <
1374 $self->gender ? $2 : $1 1607 (?:
1608 ([^<>]*) (?{ $group = $^N })
1609 | < $interior >
1610 )
1611 >
1612 %gcsx
1613 ) {
1614 my ($code, $data) = ($1, $group);
1615
1616 if ($code eq "B") {
1617 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1618 } elsif ($code eq "I") {
1619 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1620 } elsif ($code eq "U") {
1621 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1622 } elsif ($code eq "C") {
1623 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1624 } elsif ($code eq "T") {
1625 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1626 } elsif ($code eq "G") {
1627 my ($male, $female) = split /\|/, $data;
1628 $data = $self->gender ? $female : $male;
1629 $xml .= expand_cfpod ($self, $data);
1630 } elsif ($code eq "H") {
1631 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1632 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1633 "")
1634 [$self->{hintmode}];
1635 } else {
1636 $xml .= "error processing '$code($data)' directive";
1637 }
1638 } else {
1639 if ($pod =~ /\G(.+)/) {
1640 warn "parse error while expanding $pod (at $1)";
1641 }
1642 last;
1375 }ge 1643 }
1376 # replace H<hint text> 1644 }
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1378 1645
1646 for ($xml) {
1379 # create single paragraphs (very hackish) 1647 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g; 1648 s/(?<=\S)\n(?=\w)/ /g;
1381 1649
1382 $_ 1650 # compress some whitespace
1383} 1651 s/\s+\n/\n/g; # ws line-ends
1652 s/\n\n+/\n/g; # double lines
1653 s/^\n+//; # beginning lines
1654 s/\n+$//; # ending lines
1655 }
1384 1656
1657 $xml
1658}
1659
1660no re 'eval';
1661
1662sub hintmode {
1663 $_[0]{hintmode} = $_[1] if @_ > 1;
1664 $_[0]{hintmode}
1665}
1666
1385=item $player->ext_reply ($msgid, %msg) 1667=item $player->ext_reply ($msgid, @msg)
1386 1668
1387Sends an ext reply to the player. 1669Sends an ext reply to the player.
1388 1670
1389=cut 1671=cut
1390 1672
1391sub ext_reply($$%) { 1673sub ext_reply($$@) {
1392 my ($self, $id, %msg) = @_; 1674 my ($self, $id, @msg) = @_;
1393 1675
1394 $msg{msgid} = $id; 1676 $self->ns->ext_reply ($id, @msg)
1395
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1677}
1398 1678
1399=item $player->ext_event ($type, %msg) 1679=item $player->ext_msg ($type, @msg)
1400 1680
1401Sends an ext event to the client. 1681Sends an ext event to the client.
1402 1682
1403=cut 1683=cut
1404 1684
1405sub ext_event($$%) { 1685sub ext_msg($$@) {
1406 my ($self, $type, %msg) = @_; 1686 my ($self, $type, @msg) = @_;
1407 1687
1408 $self->ns->ext_event ($type, %msg); 1688 $self->ns->ext_msg ($type, @msg);
1409} 1689}
1410 1690
1411=head3 cf::region 1691=head3 cf::region
1412 1692
1413=over 4 1693=over 4
1426 my ($path) = @_; 1706 my ($path) = @_;
1427 1707
1428 my ($match, $specificity); 1708 my ($match, $specificity);
1429 1709
1430 for my $region (list) { 1710 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1711 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1712 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1713 if $region->specificity > $specificity;
1434 } 1714 }
1435 } 1715 }
1436 1716
1556 $self->init; # pass $1 etc. 1836 $self->init; # pass $1 etc.
1557 return $self; 1837 return $self;
1558 } 1838 }
1559 } 1839 }
1560 1840
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 1841 Carp::cluck "unable to resolve path '$path' (base '$base').";
1562 () 1842 ()
1563} 1843}
1564 1844
1565sub init { 1845sub init {
1566 my ($self) = @_; 1846 my ($self) = @_;
1629 1909
1630sub load_header_from($) { 1910sub load_header_from($) {
1631 my ($self, $path) = @_; 1911 my ($self, $path) = @_;
1632 1912
1633 utf8::encode $path; 1913 utf8::encode $path;
1634 #aio_open $path, O_RDONLY, 0 1914 my $f = new_from_file cf::object::thawer $path
1635 # or return;
1636
1637 $self->_load_header ($path)
1638 or return; 1915 or return;
1916
1917 $self->_load_header ($f)
1918 or return;
1919
1920 local $MAP_LOADING{$self->{path}} = $self;
1921 $f->resolve_delayed_derefs;
1639 1922
1640 $self->{load_path} = $path; 1923 $self->{load_path} = $path;
1641 1924
1642 1 1925 1
1643} 1926}
1697sub find { 1980sub find {
1698 my ($path, $origin) = @_; 1981 my ($path, $origin) = @_;
1699 1982
1700 $path = normalise $path, $origin && $origin->path; 1983 $path = normalise $path, $origin && $origin->path;
1701 1984
1985 cf::lock_wait "map_data:$path";#d#remove
1702 cf::lock_wait "map_find:$path"; 1986 cf::lock_wait "map_find:$path";
1703 1987
1704 $cf::MAP{$path} || do { 1988 $cf::MAP{$path} || do {
1705 my $guard = cf::lock_acquire "map_find:$path"; 1989 my $guard1 = cf::lock_acquire "map_find:$path";
1990 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1991
1706 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
1707 or return; 1993 or return;
1708 1994
1709 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
1710 1996
1712 or return; 1998 or return;
1713 1999
1714 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715 # doing this can freeze the server in a sync job, obviously 2001 # doing this can freeze the server in a sync job, obviously
1716 #$cf::WAIT_FOR_TICK->wait; 2002 #$cf::WAIT_FOR_TICK->wait;
2003 undef $guard1;
2004 undef $guard2;
1717 $map->reset; 2005 $map->reset;
1718 undef $guard;
1719 return find $path; 2006 return find $path;
1720 } 2007 }
1721 2008
1722 $cf::MAP{$path} = $map 2009 $cf::MAP{$path} = $map
1723 } 2010 }
1732 local $self->{deny_reset} = 1; # loading can take a long time 2019 local $self->{deny_reset} = 1; # loading can take a long time
1733 2020
1734 my $path = $self->{path}; 2021 my $path = $self->{path};
1735 2022
1736 { 2023 {
1737 my $guard = cf::lock_acquire "map_load:$path"; 2024 my $guard = cf::lock_acquire "map_data:$path";
1738 2025
2026 return unless $self->valid;
1739 return if $self->in_memory != cf::MAP_SWAPPED; 2027 return unless $self->in_memory == cf::MAP_SWAPPED;
1740 2028
1741 $self->in_memory (cf::MAP_LOADING); 2029 $self->in_memory (cf::MAP_LOADING);
1742 2030
1743 $self->alloc; 2031 $self->alloc;
1744 2032
1745 $self->pre_load; 2033 $self->pre_load;
1746 Coro::cede; 2034 cf::cede_to_tick;
1747 2035
2036 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block;
1748 $self->_load_objects ($self->{load_path}, 1) 2038 $self->_load_objects ($f)
1749 or return; 2039 or return;
1750 2040
1751 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2041 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1752 if delete $self->{load_original}; 2042 if delete $self->{load_original};
1753 2043
1754 if (my $uniq = $self->uniq_path) { 2044 if (my $uniq = $self->uniq_path) {
1755 utf8::encode $uniq; 2045 utf8::encode $uniq;
1756 if (aio_open $uniq, O_RDONLY, 0) { 2046 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) {
1757 $self->clear_unique_items; 2048 $self->clear_unique_items;
1758 $self->_load_objects ($uniq, 0); 2049 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs;
2051 }
1759 } 2052 }
1760 } 2053 }
1761 2054
1762 Coro::cede; 2055 $f->resolve_delayed_derefs;
2056
2057 cf::cede_to_tick;
1763 # now do the right thing for maps 2058 # now do the right thing for maps
1764 $self->link_multipart_objects; 2059 $self->link_multipart_objects;
1765 $self->difficulty ($self->estimate_difficulty) 2060 $self->difficulty ($self->estimate_difficulty)
1766 unless $self->difficulty; 2061 unless $self->difficulty;
1767 Coro::cede; 2062 cf::cede_to_tick;
1768 2063
1769 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
1770 $self->decay_objects; 2065 $self->decay_objects;
1771 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
1772 $self->update_buttons; 2067 $self->update_buttons;
1773 Coro::cede; 2068 cf::cede_to_tick;
1774 $self->set_darkness_map; 2069 $self->set_darkness_map;
1775 Coro::cede; 2070 cf::cede_to_tick;
1776 $self->activate; 2071 $self->activate;
1777 } 2072 }
2073
2074 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME);
1778 2076
1779 $self->in_memory (cf::MAP_IN_MEMORY); 2077 $self->in_memory (cf::MAP_IN_MEMORY);
1780 } 2078 }
1781 2079
1782 $self->post_load; 2080 $self->post_load;
1793 2091
1794 $self 2092 $self
1795} 2093}
1796 2094
1797# find and load all maps in the 3x3 area around a map 2095# find and load all maps in the 3x3 area around a map
1798sub load_diag { 2096sub load_neighbours {
1799 my ($map) = @_; 2097 my ($map) = @_;
1800 2098
1801 my @diag; # diagonal neighbours 2099 my @neigh; # diagonal neighbours
1802 2100
1803 for (0 .. 3) { 2101 for (0 .. 3) {
1804 my $neigh = $map->tile_path ($_) 2102 my $neigh = $map->tile_path ($_)
1805 or next; 2103 or next;
1806 $neigh = find $neigh, $map 2104 $neigh = find $neigh, $map
1807 or next; 2105 or next;
1808 $neigh->load; 2106 $neigh->load;
1809 2107
2108 push @neigh,
1810 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2109 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1811 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2110 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1812 } 2111 }
1813 2112
1814 for (@diag) { 2113 for (grep defined $_->[0], @neigh) {
2114 my ($path, $origin) = @$_;
1815 my $neigh = find @$_ 2115 my $neigh = find $path, $origin
1816 or next; 2116 or next;
1817 $neigh->load; 2117 $neigh->load;
1818 } 2118 }
1819} 2119}
1820 2120
1825} 2125}
1826 2126
1827sub do_load_sync { 2127sub do_load_sync {
1828 my ($map) = @_; 2128 my ($map) = @_;
1829 2129
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main;
2132
1830 cf::sync_job { $map->load }; 2133 cf::sync_job { $map->load };
1831} 2134}
1832 2135
1833our %MAP_PREFETCH; 2136our %MAP_PREFETCH;
1834our $MAP_PREFETCHER = undef; 2137our $MAP_PREFETCHER = undef;
1835 2138
1836sub find_async { 2139sub find_async {
1837 my ($path, $origin) = @_; 2140 my ($path, $origin, $load) = @_;
1838 2141
1839 $path = normalise $path, $origin && $origin->{path}; 2142 $path = normalise $path, $origin && $origin->{path};
1840 2143
1841 if (my $map = $cf::MAP{$path}) { 2144 if (my $map = $cf::MAP{$path}) {
1842 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2145 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1843 } 2146 }
1844 2147
1845 undef $MAP_PREFETCH{$path}; 2148 $MAP_PREFETCH{$path} |= $load;
2149
1846 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
2151 $Coro::current->{desc} = "map prefetcher";
2152
1847 while (%MAP_PREFETCH) { 2153 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 2154 while (my ($k, $v) = each %MAP_PREFETCH) {
1849 my $map = find $path 2155 if (my $map = find $k) {
1850 or next;
1851 $map->load; 2156 $map->load if $v;
2157 }
1852 2158
1853 delete $MAP_PREFETCH{$path}; 2159 delete $MAP_PREFETCH{$k};
1854 } 2160 }
1855 } 2161 }
1856 undef $MAP_PREFETCHER; 2162 undef $MAP_PREFETCHER;
1857 }; 2163 };
1858 $MAP_PREFETCHER->prio (6); 2164 $MAP_PREFETCHER->prio (6);
1861} 2167}
1862 2168
1863sub save { 2169sub save {
1864 my ($self) = @_; 2170 my ($self) = @_;
1865 2171
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2173
1868 $self->{last_save} = $cf::RUNTIME; 2174 $self->{last_save} = $cf::RUNTIME;
1869 2175
1870 return unless $self->dirty; 2176 return unless $self->dirty;
1871 2177
1877 return if $self->{deny_save}; 2183 return if $self->{deny_save};
1878 2184
1879 local $self->{last_access} = $self->last_access;#d# 2185 local $self->{last_access} = $self->last_access;#d#
1880 2186
1881 cf::async { 2187 cf::async {
2188 $Coro::current->{desc} = "map player save";
1882 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
1883 }; 2190 };
1884 2191
1885 if ($uniq) { 2192 if ($uniq) {
1886 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1894 my ($self) = @_; 2201 my ($self) = @_;
1895 2202
1896 # save first because save cedes 2203 # save first because save cedes
1897 $self->save; 2204 $self->save;
1898 2205
1899 my $lock = cf::lock_acquire "map_data:" . $self->path; 2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
1900 2207
1901 return if $self->players; 2208 return if $self->players;
1902 return if $self->in_memory != cf::MAP_IN_MEMORY; 2209 return if $self->in_memory != cf::MAP_IN_MEMORY;
1903 return if $self->{deny_save}; 2210 return if $self->{deny_save};
1904 2211
2212 $self->in_memory (cf::MAP_SWAPPED);
2213
2214 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP;
1905 $self->clear; 2216 $self->clear;
1906 $self->in_memory (cf::MAP_SWAPPED);
1907} 2217}
1908 2218
1909sub reset_at { 2219sub reset_at {
1910 my ($self) = @_; 2220 my ($self) = @_;
1911 2221
1943 if $uniq; 2253 if $uniq;
1944 } 2254 }
1945 2255
1946 delete $cf::MAP{$self->path}; 2256 delete $cf::MAP{$self->path};
1947 2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
1948 $self->clear; 2260 $self->clear;
1949
1950 $_->clear_links_to ($self) for values %cf::MAP;
1951 2261
1952 $self->unlink_save; 2262 $self->unlink_save;
1953 $self->destroy; 2263 $self->destroy;
1954} 2264}
1955 2265
1956my $nuke_counter = "aaaa"; 2266my $nuke_counter = "aaaa";
1957 2267
1958sub nuke { 2268sub nuke {
1959 my ($self) = @_; 2269 my ($self) = @_;
1960 2270
2271 {
2272 my $lock = cf::lock_acquire "map_data:$self->{path}";
2273
1961 delete $cf::MAP{$self->path}; 2274 delete $cf::MAP{$self->path};
1962 2275
1963 $self->unlink_save; 2276 $self->unlink_save;
1964 2277
1965 bless $self, "cf::map"; 2278 bless $self, "cf::map";
1966 delete $self->{deny_reset}; 2279 delete $self->{deny_reset};
1967 $self->{deny_save} = 1; 2280 $self->{deny_save} = 1;
1968 $self->reset_timeout (1); 2281 $self->reset_timeout (1);
1969 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970 2283
1971 $cf::MAP{$self->path} = $self; 2284 $cf::MAP{$self->path} = $self;
2285 }
1972 2286
1973 $self->reset; # polite request, might not happen 2287 $self->reset; # polite request, might not happen
1974} 2288}
1975 2289
1976=item $maps = cf::map::tmp_maps 2290=item $maps = cf::map::tmp_maps
2052 2366
2053sub inv_recursive { 2367sub inv_recursive {
2054 inv_recursive_ inv $_[0] 2368 inv_recursive_ inv $_[0]
2055} 2369}
2056 2370
2371=item $ref = $ob->ref
2372
2373creates and returns a persistent reference to an objetc that can be stored as a string.
2374
2375=item $ob = cf::object::deref ($refstring)
2376
2377returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2378even if the object actually exists. May block.
2379
2380=cut
2381
2382sub deref {
2383 my ($ref) = @_;
2384
2385 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2386 my ($uuid, $name) = ($1, $2);
2387 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2388 or return;
2389 $pl->ob->uuid eq $uuid
2390 or return;
2391
2392 $pl->ob
2393 } else {
2394 warn "$ref: cannot resolve object reference\n";
2395 undef
2396 }
2397}
2398
2057package cf; 2399package cf;
2058 2400
2059=back 2401=back
2060 2402
2061=head3 cf::object::player 2403=head3 cf::object::player
2083 2425
2084 } else { 2426 } else {
2085 my $pl = $self->contr; 2427 my $pl = $self->contr;
2086 2428
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2429 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog}; 2430 my $dialog = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply ( 2431 $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 2432
2096 } else { 2433 } else {
2097 $msg = $npc->name . " says: $msg" if $npc; 2434 $msg = $npc->name . " says: $msg" if $npc;
2098 $self->message ($msg, $flags); 2435 $self->message ($msg, $flags);
2099 } 2436 }
2100 } 2437 }
2438}
2439
2440=item $object->send_msg ($channel, $msg, $color, [extra...])
2441
2442=cut
2443
2444sub cf::object::send_msg {
2445 my $pl = shift->contr
2446 or return;
2447 $pl->send_msg (@_);
2101} 2448}
2102 2449
2103=item $player_object->may ("access") 2450=item $player_object->may ("access")
2104 2451
2105Returns wether the given player is authorized to access resource "access" 2452Returns wether the given player is authorized to access resource "access"
2184 # use -1 or undef as default coordinates, not 0, 0 2531 # use -1 or undef as default coordinates, not 0, 0
2185 ($x, $y) = ($map->enter_x, $map->enter_y) 2532 ($x, $y) = ($map->enter_x, $map->enter_y)
2186 if $x <=0 && $y <= 0; 2533 if $x <=0 && $y <= 0;
2187 2534
2188 $map->load; 2535 $map->load;
2189 $map->load_diag; 2536 $map->load_neighbours;
2190 2537
2191 return unless $self->contr->active; 2538 return unless $self->contr->active;
2192 $self->activate_recursive; 2539 $self->activate_recursive;
2193 2540
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2541 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2542 $self->enter_map ($map, $x, $y);
2196} 2543}
2197 2544
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2545=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199 2546
2200Moves the player to the given map-path and coordinates by first freezing 2547Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback 2548her, loading and preparing them map, calling the provided $check callback
2202that has to return the map if sucecssful, and then unfreezes the player on 2549that has to return the map if sucecssful, and then unfreezes the player on
2203the new (success) or old (failed) map position. 2550the new (success) or old (failed) map position. In either case, $done will
2551be called at the end of this process.
2204 2552
2205=cut 2553=cut
2206 2554
2207our $GOTOGEN; 2555our $GOTOGEN;
2208 2556
2209sub cf::object::player::goto { 2557sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2558 my ($self, $path, $x, $y, $check, $done) = @_;
2211 2559
2212 # do generation counting so two concurrent goto's will be executed in-order 2560 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2562
2215 $self->enter_link; 2563 $self->enter_link;
2216 2564
2217 (async { 2565 (async {
2566 $Coro::current->{desc} = "player::goto $path $x $y";
2567
2568 # *tag paths override both path and x|y
2569 if ($path =~ /^\*(.*)$/) {
2570 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2571 my $ob = $obs[rand @obs];
2572
2573 # see if we actually can go there
2574 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2575 $ob = $obs[rand @obs];
2576 } else {
2577 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2578 }
2579 # else put us there anyways for now #d#
2580
2581 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2582 } else {
2583 ($path, $x, $y) = (undef, undef, undef);
2584 }
2585 }
2586
2218 my $map = eval { 2587 my $map = eval {
2219 my $map = cf::map::find $path; 2588 my $map = defined $path ? cf::map::find $path : undef;
2220 2589
2221 if ($map) { 2590 if ($map) {
2222 $map = $map->customise_for ($self); 2591 $map = $map->customise_for ($self);
2223 $map = $check->($map) if $check && $map; 2592 $map = $check->($map) if $check && $map;
2224 } else { 2593 } else {
2225 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2594 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2226 } 2595 }
2227 2596
2228 $map 2597 $map
2229 }; 2598 };
2230 2599
2235 2604
2236 if ($gen == $self->{_goto_generation}) { 2605 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2606 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2607 $self->leave_link ($map, $x, $y);
2239 } 2608 }
2609
2610 $done->() if $done;
2240 })->prio (1); 2611 })->prio (1);
2241} 2612}
2242 2613
2243=item $player_object->enter_exit ($exit_object) 2614=item $player_object->enter_exit ($exit_object)
2244 2615
2281 $rmp->{origin_y} = $exit->y; 2652 $rmp->{origin_y} = $exit->y;
2282 } 2653 }
2283 2654
2284 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2285 2656
2286 my $data = cf::to_json $rmp; 2657 my $data = cf::encode_json $rmp;
2287 my $md5 = Digest::MD5::md5_hex $data; 2658 my $md5 = Digest::MD5::md5_hex $data;
2288 my $meta = "$RANDOMDIR/$md5.meta"; 2659 my $meta = "$RANDOMDIR/$md5.meta";
2289 2660
2290 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2291 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
2313 my $hp = $exit->stats->hp; 2684 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp; 2685 my $sp = $exit->stats->sp;
2315 2686
2316 $self->enter_link; 2687 $self->enter_link;
2317 2688
2689 # if exit is damned, update players death & WoR home-position
2690 $self->contr->savebed ($slaying, $hp, $sp)
2691 if $exit->flag (FLAG_DAMNED);
2692
2318 (async { 2693 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2695
2319 $self->deactivate_recursive; # just to be sure 2696 $self->deactivate_recursive; # just to be sure
2320 unless (eval { 2697 unless (eval {
2321 $self->goto ($slaying, $hp, $sp); 2698 $self->goto ($slaying, $hp, $sp);
2322 2699
2323 1; 2700 1;
2349 2726
2350 utf8::encode $text; 2727 utf8::encode $text;
2351 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352} 2729}
2353 2730
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 2731=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 2732
2356Send a drawinfo or msg packet to the client, formatting the msg for the 2733Send 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 2734client 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 2735the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet. 2736the message unless the client supports the msg packet.
2360 2737
2361=cut 2738=cut
2362 2739
2740# non-persistent channels (usually the info channel)
2741our %CHANNEL = (
2742 "c/identify" => {
2743 id => "infobox",
2744 title => "Identify",
2745 reply => undef,
2746 tooltip => "Items recently identified",
2747 },
2748 "c/examine" => {
2749 id => "infobox",
2750 title => "Examine",
2751 reply => undef,
2752 tooltip => "Signs and other items you examined",
2753 },
2754 "c/book" => {
2755 id => "infobox",
2756 title => "Book",
2757 reply => undef,
2758 tooltip => "The contents of a note or book",
2759 },
2760 "c/lookat" => {
2761 id => "infobox",
2762 title => "Look",
2763 reply => undef,
2764 tooltip => "What you saw there",
2765 },
2766 "c/who" => {
2767 id => "infobox",
2768 title => "Players",
2769 reply => undef,
2770 tooltip => "Shows players who are currently online",
2771 },
2772 "c/body" => {
2773 id => "infobox",
2774 title => "Body Parts",
2775 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available",
2777 },
2778 "c/uptime" => {
2779 id => "infobox",
2780 title => "Uptime",
2781 reply => undef,
2782 tooltip => "How long the server has been running since last restart",
2783 },
2784 "c/mapinfo" => {
2785 id => "infobox",
2786 title => "Map Info",
2787 reply => undef,
2788 tooltip => "Information related to the maps",
2789 },
2790);
2791
2363sub cf::client::send_msg { 2792sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2793 my ($self, $channel, $msg, $color, @extra) = @_;
2365 2794
2366 $msg = $self->pl->expand_cfpod ($msg); 2795 $msg = $self->pl->expand_cfpod ($msg);
2367 2796
2797 $color &= cf::NDI_CLIENT_MASK; # just in case...
2798
2799 # check predefined channels, for the benefit of C
2800 if ($CHANNEL{$channel}) {
2801 $channel = $CHANNEL{$channel};
2802
2803 $self->ext_msg (channel_info => $channel)
2804 if $self->can_msg;
2805
2806 $channel = $channel->{id};
2807
2808 } elsif (ref $channel) {
2809 # send meta info to client, if not yet sent
2810 unless (exists $self->{channel}{$channel->{id}}) {
2811 $self->{channel}{$channel->{id}} = $channel;
2812 $self->ext_msg (channel_info => $channel)
2813 if $self->can_msg;
2814 }
2815
2816 $channel = $channel->{id};
2817 }
2818
2819 return unless @extra || length $msg;
2820
2368 if ($self->can_msg) { 2821 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2822 # default colour, mask it out
2823 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2824 if $color & cf::NDI_DEF;
2825
2826 $self->send_packet ("msg " . $self->{json_coder}->encode (
2827 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2370 } else { 2828 } 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]${2}[\/color]/;
2379 }
2380
2381 if ($color >= 0) { 2829 if ($color >= 0) {
2830 # replace some tags by gcfclient-compatible ones
2831 for ($msg) {
2832 1 while
2833 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2834 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2835 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2836 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2837 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2838 }
2839
2840 $color &= cf::NDI_COLOR_MASK;
2841
2842 utf8::encode $msg;
2843
2382 if (0 && $msg =~ /\[/) { 2844 if (0 && $msg =~ /\[/) {
2845 # COMMAND/INFO
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2846 $self->send_packet ("drawextinfo $color 10 8 $msg")
2384 } else { 2847 } else {
2385 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2848 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2386 $self->send_packet ("drawinfo $color $msg") 2849 $self->send_packet ("drawinfo $color $msg")
2387 } 2850 }
2388 } 2851 }
2389 } 2852 }
2390} 2853}
2391 2854
2392=item $client->ext_event ($type, %msg) 2855=item $client->ext_msg ($type, @msg)
2393 2856
2394Sends an exti event to the client. 2857Sends an ext event to the client.
2395 2858
2396=cut 2859=cut
2397 2860
2398sub cf::client::ext_event($$%) { 2861sub cf::client::ext_msg($$@) {
2399 my ($self, $type, %msg) = @_; 2862 my ($self, $type, @msg) = @_;
2400 2863
2864 if ($self->extcmd == 2) {
2865 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2866 } elsif ($self->extcmd == 1) { # TODO: remove
2401 $msg{msgtype} = "event_$type"; 2867 push @msg, msgtype => "event_$type";
2402 $self->send_packet ("ext " . cf::to_json \%msg); 2868 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2869 }
2870}
2871
2872=item $client->ext_reply ($msgid, @msg)
2873
2874Sends an ext reply to the client.
2875
2876=cut
2877
2878sub cf::client::ext_reply($$@) {
2879 my ($self, $id, @msg) = @_;
2880
2881 if ($self->extcmd == 2) {
2882 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2883 } elsif ($self->extcmd == 1) {
2884 #TODO: version 1, remove
2885 unshift @msg, msgtype => "reply", msgid => $id;
2886 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2887 }
2403} 2888}
2404 2889
2405=item $success = $client->query ($flags, "text", \&cb) 2890=item $success = $client->query ($flags, "text", \&cb)
2406 2891
2407Queues a query to the client, calling the given callback with 2892Queues a query to the client, calling the given callback with
2408the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2893the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2409C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2894C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2410 2895
2411Queries can fail, so check the return code. Or don't, as queries will become 2896Queries can fail, so check the return code. Or don't, as queries will
2412reliable at some point in the future. 2897become reliable at some point in the future.
2413 2898
2414=cut 2899=cut
2415 2900
2416sub cf::client::query { 2901sub cf::client::query {
2417 my ($self, $flags, $text, $cb) = @_; 2902 my ($self, $flags, $text, $cb) = @_;
2425 utf8::encode $text; 2910 utf8::encode $text;
2426 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2911 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427 2912
2428 $self->send_packet ($self->{query_queue}[0][0]) 2913 $self->send_packet ($self->{query_queue}[0][0])
2429 if @{ $self->{query_queue} } == 1; 2914 if @{ $self->{query_queue} } == 1;
2915
2916 1
2430} 2917}
2431 2918
2432cf::client->attach ( 2919cf::client->attach (
2920 on_connect => sub {
2921 my ($ns) = @_;
2922
2923 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2924 },
2433 on_reply => sub { 2925 on_reply => sub {
2434 my ($ns, $msg) = @_; 2926 my ($ns, $msg) = @_;
2435 2927
2436 # this weird shuffling is so that direct followup queries 2928 # this weird shuffling is so that direct followup queries
2437 # get handled first 2929 # get handled first
2449 } else { 2941 } else {
2450 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2942 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451 } 2943 }
2452 } 2944 }
2453 }, 2945 },
2946 on_exticmd => sub {
2947 my ($ns, $buf) = @_;
2948
2949 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2950
2951 if (ref $msg) {
2952 my ($type, $reply, @payload) =
2953 "ARRAY" eq ref $msg
2954 ? @$msg
2955 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2956
2957 my @reply;
2958
2959 if (my $cb = $EXTICMD{$type}) {
2960 @reply = $cb->($ns, @payload);
2961 }
2962
2963 $ns->ext_reply ($reply, @reply)
2964 if $reply;
2965
2966 } else {
2967 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2968 }
2969
2970 cf::override;
2971 },
2454); 2972);
2455 2973
2456=item $client->async (\&cb) 2974=item $client->async (\&cb)
2457 2975
2458Create a new coroutine, running the specified callback. The coroutine will 2976Create a new coroutine, running the specified callback. The coroutine will
2499our $safe = new Safe "safe"; 3017our $safe = new Safe "safe";
2500our $safe_hole = new Safe::Hole; 3018our $safe_hole = new Safe::Hole;
2501 3019
2502$SIG{FPE} = 'IGNORE'; 3020$SIG{FPE} = 'IGNORE';
2503 3021
2504$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3022$safe->permit_only (Opcode::opset qw(
3023 :base_core :base_mem :base_orig :base_math
3024 grepstart grepwhile mapstart mapwhile
3025 sort time
3026));
2505 3027
2506# here we export the classes and methods available to script code 3028# here we export the classes and methods available to script code
2507 3029
2508=pod 3030=pod
2509 3031
2510The following functions and methods are available within a safe environment: 3032The following functions and methods are available within a safe environment:
2511 3033
2512 cf::object contr pay_amount pay_player map 3034 cf::object
3035 contr pay_amount pay_player map x y force_find force_add destroy
3036 insert remove name archname title slaying race decrease_ob_nr
3037
2513 cf::object::player player 3038 cf::object::player
2514 cf::player peaceful 3039 player
2515 cf::map trigger 3040
3041 cf::player
3042 peaceful
3043
3044 cf::map
3045 trigger
2516 3046
2517=cut 3047=cut
2518 3048
2519for ( 3049for (
2520 ["cf::object" => qw(contr pay_amount pay_player map)], 3050 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3051 insert remove inv name archname title slaying race
3052 decrease_ob_nr destroy)],
2521 ["cf::object::player" => qw(player)], 3053 ["cf::object::player" => qw(player)],
2522 ["cf::player" => qw(peaceful)], 3054 ["cf::player" => qw(peaceful)],
2523 ["cf::map" => qw(trigger)], 3055 ["cf::map" => qw(trigger)],
2524) { 3056) {
2525 no strict 'refs'; 3057 no strict 'refs';
2601# the server's init and main functions 3133# the server's init and main functions
2602 3134
2603sub load_facedata($) { 3135sub load_facedata($) {
2604 my ($path) = @_; 3136 my ($path) = @_;
2605 3137
3138 # HACK to clear player env face cache, we need some signal framework
3139 # for this (global event?)
3140 %ext::player_env::MUSIC_FACE_CACHE = ();
3141
3142 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3143
2606 warn "loading facedata from $path\n"; 3144 warn "loading facedata from $path\n";
2607 3145
2608 my $facedata; 3146 my $facedata;
2609 0 < aio_load $path, $facedata 3147 0 < aio_load $path, $facedata
2610 or die "$path: $!"; 3148 or die "$path: $!";
2612 $facedata = Coro::Storable::thaw $facedata; 3150 $facedata = Coro::Storable::thaw $facedata;
2613 3151
2614 $facedata->{version} == 2 3152 $facedata->{version} == 2
2615 or cf::cleanup "$path: version mismatch, cannot proceed."; 3153 or cf::cleanup "$path: version mismatch, cannot proceed.";
2616 3154
3155 # patch in the exptable
3156 $facedata->{resource}{"res/exp_table"} = {
3157 type => FT_RSRC,
3158 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3159 };
3160 cf::cede_to_tick;
3161
2617 { 3162 {
2618 my $faces = $facedata->{faceinfo}; 3163 my $faces = $facedata->{faceinfo};
2619 3164
2620 while (my ($face, $info) = each %$faces) { 3165 while (my ($face, $info) = each %$faces) {
2621 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3166 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3167
2622 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3168 cf::face::set_visibility $idx, $info->{visibility};
3169 cf::face::set_magicmap $idx, $info->{magicmap};
2623 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3170 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2624 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3171 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2625 Coro::cede; 3172
3173 cf::cede_to_tick;
2626 } 3174 }
2627 3175
2628 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2629 next unless $info->{smooth}; 3177 next unless $info->{smooth};
3178
2630 my $idx = cf::face::find $face 3179 my $idx = cf::face::find $face
2631 or next; 3180 or next;
3181
2632 if (my $smooth = cf::face::find $info->{smooth}) { 3182 if (my $smooth = cf::face::find $info->{smooth}) {
3183 cf::face::set_smooth $idx, $smooth;
2633 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3184 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634 } else { 3185 } else {
2635 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3186 warn "smooth face '$info->{smooth}' not found for face '$face'";
2636 } 3187 }
2637 Coro::cede; 3188
3189 cf::cede_to_tick;
2638 } 3190 }
2639 } 3191 }
2640 3192
2641 { 3193 {
2642 my $anims = $facedata->{animinfo}; 3194 my $anims = $facedata->{animinfo};
2643 3195
2644 while (my ($anim, $info) = each %$anims) { 3196 while (my ($anim, $info) = each %$anims) {
2645 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3197 cf::anim::set $anim, $info->{frames}, $info->{facings};
2646 Coro::cede; 3198 cf::cede_to_tick;
2647 } 3199 }
2648 3200
2649 cf::anim::invalidate_all; # d'oh 3201 cf::anim::invalidate_all; # d'oh
2650 } 3202 }
2651 3203
3204 {
3205 # TODO: for gcfclient pleasure, we should give resources
3206 # that gcfclient doesn't grok a >10000 face index.
3207 my $res = $facedata->{resource};
3208
3209 while (my ($name, $info) = each %$res) {
3210 if (defined $info->{type}) {
3211 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3212 my $data;
3213
3214 if ($info->{type} & 1) {
3215 # prepend meta info
3216
3217 my $meta = $enc->encode ({
3218 name => $name,
3219 %{ $info->{meta} || {} },
3220 });
3221
3222 $data = pack "(w/a*)*", $meta, $info->{data};
3223 } else {
3224 $data = $info->{data};
3225 }
3226
3227 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3228 cf::face::set_type $idx, $info->{type};
3229 } else {
3230 $RESOURCE{$name} = $info;
3231 }
3232
3233 cf::cede_to_tick;
3234 }
3235 }
3236
3237 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3238
2652 1 3239 1
2653} 3240}
2654 3241
3242cf::global->attach (on_resource_update => sub {
3243 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3244 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3245
3246 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3247 my $sound = $soundconf->{compat}[$_]
3248 or next;
3249
3250 my $face = cf::face::find "sound/$sound->[1]";
3251 cf::sound::set $sound->[0] => $face;
3252 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3253 }
3254
3255 while (my ($k, $v) = each %{$soundconf->{event}}) {
3256 my $face = cf::face::find "sound/$v";
3257 cf::sound::set $k => $face;
3258 }
3259 }
3260});
3261
3262register_exticmd fx_want => sub {
3263 my ($ns, $want) = @_;
3264
3265 while (my ($k, $v) = each %$want) {
3266 $ns->fx_want ($k, $v);
3267 }
3268};
3269
2655sub reload_regions { 3270sub reload_regions {
3271 # HACK to clear player env face cache, we need some signal framework
3272 # for this (global event?)
3273 %ext::player_env::MUSIC_FACE_CACHE = ();
3274
2656 load_resource_file "$MAPDIR/regions" 3275 load_resource_file "$MAPDIR/regions"
2657 or die "unable to load regions file\n"; 3276 or die "unable to load regions file\n";
3277
3278 for (cf::region::list) {
3279 $_->{match} = qr/$_->{match}/
3280 if exists $_->{match};
3281 }
2658} 3282}
2659 3283
2660sub reload_facedata { 3284sub reload_facedata {
2661 load_facedata "$DATADIR/facedata" 3285 load_facedata "$DATADIR/facedata"
2662 or die "unable to load facedata\n"; 3286 or die "unable to load facedata\n";
2663} 3287}
2664 3288
2665sub reload_archetypes { 3289sub reload_archetypes {
3290 load_resource_file "$DATADIR/archetypes"
3291 or die "unable to load archetypes\n";
3292 #d# NEED to laod twice to resolve forward references
3293 # this really needs to be done in an extra post-pass
3294 # (which needs to be synchronous, so solve it differently)
2666 load_resource_file "$DATADIR/archetypes" 3295 load_resource_file "$DATADIR/archetypes"
2667 or die "unable to load archetypes\n"; 3296 or die "unable to load archetypes\n";
2668} 3297}
2669 3298
2670sub reload_treasures { 3299sub reload_treasures {
2686 3315
2687sub init { 3316sub init {
2688 reload_resources; 3317 reload_resources;
2689} 3318}
2690 3319
2691sub cfg_load { 3320sub reload_config {
2692 open my $fh, "<:utf8", "$CONFDIR/config" 3321 open my $fh, "<:utf8", "$CONFDIR/config"
2693 or return; 3322 or return;
2694 3323
2695 local $/; 3324 local $/;
2696 *CFG = YAML::Syck::Load <$fh>; 3325 *CFG = YAML::Load <$fh>;
2697 3326
2698 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3327 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2699 3328
2700 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3329 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2701 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3330 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2712sub main { 3341sub main {
2713 # we must not ever block the main coroutine 3342 # we must not ever block the main coroutine
2714 local $Coro::idle = sub { 3343 local $Coro::idle = sub {
2715 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3344 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2716 (async { 3345 (async {
2717 Event::one_event; 3346 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT;
2718 })->prio (Coro::PRIO_MAX); 3348 })->prio (Coro::PRIO_MAX);
2719 }; 3349 };
2720 3350
2721 cfg_load; 3351 reload_config;
2722 db_init; 3352 db_init;
2723 load_extensions; 3353 load_extensions;
2724 3354
2725 $TICK_WATCHER->start; 3355 $TICK_WATCHER->start;
3356 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2726 Event::loop; 3357 EV::loop;
2727} 3358}
2728 3359
2729############################################################################# 3360#############################################################################
2730# initialisation and cleanup 3361# initialisation and cleanup
2731 3362
2732# install some emergency cleanup handlers 3363# install some emergency cleanup handlers
2733BEGIN { 3364BEGIN {
3365 our %SIGWATCHER = ();
2734 for my $signal (qw(INT HUP TERM)) { 3366 for my $signal (qw(INT HUP TERM)) {
2735 Event->signal ( 3367 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2736 reentrant => 0,
2737 data => WF_AUTOCANCEL,
2738 signal => $signal,
2739 prio => 0,
2740 cb => sub {
2741 cf::cleanup "SIG$signal"; 3368 cf::cleanup "SIG$signal";
2742 },
2743 ); 3369 };
2744 } 3370 }
2745} 3371}
2746 3372
2747sub write_runtime { 3373sub write_runtime {
2748 my $runtime = "$LOCALDIR/runtime"; 3374 my $runtime = "$LOCALDIR/runtime";
2793 # and maps saved/destroyed asynchronously. 3419 # and maps saved/destroyed asynchronously.
2794 warn "begin emergency player save\n"; 3420 warn "begin emergency player save\n";
2795 for my $login (keys %cf::PLAYER) { 3421 for my $login (keys %cf::PLAYER) {
2796 my $pl = $cf::PLAYER{$login} or next; 3422 my $pl = $cf::PLAYER{$login} or next;
2797 $pl->valid or next; 3423 $pl->valid or next;
3424 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2798 $pl->save; 3425 $pl->save;
2799 } 3426 }
2800 warn "end emergency player save\n"; 3427 warn "end emergency player save\n";
2801 3428
2802 warn "begin emergency map save\n"; 3429 warn "begin emergency map save\n";
2841 warn "syncing database to disk"; 3468 warn "syncing database to disk";
2842 BDB::db_env_txn_checkpoint $DB_ENV; 3469 BDB::db_env_txn_checkpoint $DB_ENV;
2843 3470
2844 # if anything goes wrong in here, we should simply crash as we already saved 3471 # if anything goes wrong in here, we should simply crash as we already saved
2845 3472
2846 warn "cancelling all WF_AUTOCANCEL watchers";
2847 for (Event::all_watchers) {
2848 $_->cancel if $_->data & WF_AUTOCANCEL;
2849 }
2850
2851 warn "flushing outstanding aio requests"; 3473 warn "flushing outstanding aio requests";
2852 for (;;) { 3474 for (;;) {
2853 BDB::flush; 3475 BDB::flush;
2854 IO::AIO::flush; 3476 IO::AIO::flush;
2855 Coro::cede; 3477 Coro::cede_notself;
2856 last unless IO::AIO::nreqs || BDB::nreqs; 3478 last unless IO::AIO::nreqs || BDB::nreqs;
2857 warn "iterate..."; 3479 warn "iterate...";
2858 } 3480 }
2859 3481
2860 ++$RELOAD; 3482 ++$RELOAD;
2864 %EXT_CORO = (); 3486 %EXT_CORO = ();
2865 3487
2866 warn "removing commands"; 3488 warn "removing commands";
2867 %COMMAND = (); 3489 %COMMAND = ();
2868 3490
2869 warn "removing ext commands"; 3491 warn "removing ext/exti commands";
2870 %EXTCMD = (); 3492 %EXTCMD = ();
3493 %EXTICMD = ();
2871 3494
2872 warn "unloading/nuking all extensions"; 3495 warn "unloading/nuking all extensions";
2873 for my $pkg (@EXTS) { 3496 for my $pkg (@EXTS) {
2874 warn "... unloading $pkg"; 3497 warn "... unloading $pkg";
2875 3498
2918 warn "reloading cf.pm"; 3541 warn "reloading cf.pm";
2919 require cf; 3542 require cf;
2920 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3543 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2921 3544
2922 warn "loading config and database again"; 3545 warn "loading config and database again";
2923 cf::cfg_load; 3546 cf::reload_config;
2924 3547
2925 warn "loading extensions"; 3548 warn "loading extensions";
2926 cf::load_extensions; 3549 cf::load_extensions;
2927 3550
2928 warn "reattaching attachments to objects/players"; 3551 warn "reattaching attachments to objects/players";
2948 3571
2949sub reload_perl() { 3572sub reload_perl() {
2950 # doing reload synchronously and two reloads happen back-to-back, 3573 # doing reload synchronously and two reloads happen back-to-back,
2951 # coro crashes during coro_state_free->destroy here. 3574 # coro crashes during coro_state_free->destroy here.
2952 3575
2953 $RELOAD_WATCHER ||= Event->timer ( 3576 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2954 reentrant => 0,
2955 after => 0,
2956 data => WF_AUTOCANCEL,
2957 cb => sub {
2958 do_reload_perl; 3577 do_reload_perl;
2959 undef $RELOAD_WATCHER; 3578 undef $RELOAD_WATCHER;
2960 },
2961 ); 3579 };
2962} 3580}
2963 3581
2964register_command "reload" => sub { 3582register_command "reload" => sub {
2965 my ($who, $arg) = @_; 3583 my ($who, $arg) = @_;
2966 3584
2967 if ($who->flag (FLAG_WIZ)) { 3585 if ($who->flag (FLAG_WIZ)) {
2968 $who->message ("reloading server."); 3586 $who->message ("reloading server.");
3587 async {
3588 $Coro::current->{desc} = "perl_reload";
2969 async { reload_perl }; 3589 reload_perl;
3590 };
2970 } 3591 }
2971}; 3592};
2972 3593
2973unshift @INC, $LIBDIR; 3594unshift @INC, $LIBDIR;
2974 3595
2993 my $signal = new Coro::Signal; 3614 my $signal = new Coro::Signal;
2994 push @WAIT_FOR_TICK_BEGIN, $signal; 3615 push @WAIT_FOR_TICK_BEGIN, $signal;
2995 $signal->wait; 3616 $signal->wait;
2996} 3617}
2997 3618
2998 my $min = 1e6;#d# 3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
2999 my $avg = 10;
3000$TICK_WATCHER = Event->timer (
3001 reentrant => 0,
3002 parked => 1,
3003 prio => 0,
3004 at => $NEXT_TICK || $TICK,
3005 data => WF_AUTOCANCEL,
3006 cb => sub {
3007 if ($Coro::current != $Coro::main) { 3620 if ($Coro::current != $Coro::main) {
3008 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3621 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3009 unless ++$bug_warning > 10; 3622 unless ++$bug_warning > 10;
3010 return; 3623 return;
3011 } 3624 }
3012 3625
3013 $NOW = $tick_start = Event::time; 3626 $NOW = $tick_start = EV::now;
3014 3627
3015 cf::server_tick; # one server iteration 3628 cf::server_tick; # one server iteration
3016 3629
3017 0 && sync_job {#d# 3630 $RUNTIME += $TICK;
3018 for(1..10) { 3631 $NEXT_TICK = $_[0]->at;
3019 my $t = Event::time;
3020 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3021 or die;
3022 3632
3023 $map->width (50); 3633 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3024 $map->height (50); 3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3025 $map->alloc; 3635 Coro::async_pool {
3026 $map->_load_objects ("/tmp/x.map", 1); 3636 $Coro::current->{desc} = "runtime saver";
3027 my $t = Event::time - $t; 3637 write_runtime
3028 3638 or warn "ERROR: unable to write runtime file: $!";
3029 #next unless $t < 0.0013;#d#
3030 if ($t < $min) {
3031 $min = $t;
3032 }
3033 $avg = $avg * 0.99 + $t * 0.01;
3034 }
3035 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3036 exit 0;
3037 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3038 }; 3639 };
3640 }
3039 3641
3040 $RUNTIME += $TICK;
3041 $NEXT_TICK += $TICK;
3042
3043 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3044 $NEXT_RUNTIME_WRITE = $NOW + 10;
3045 Coro::async_pool {
3046 write_runtime
3047 or warn "ERROR: unable to write runtime file: $!";
3048 };
3049 }
3050
3051# my $AFTER = Event::time;
3052# warn $AFTER - $NOW;#d#
3053
3054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3055 $sig->send; 3643 $sig->send;
3056 } 3644 }
3057 while (my $sig = shift @WAIT_FOR_TICK) { 3645 while (my $sig = shift @WAIT_FOR_TICK) {
3058 $sig->send; 3646 $sig->send;
3059 } 3647 }
3060 3648
3061 $NOW = Event::time;
3062
3063 # if we are delayed by four ticks or more, skip them all
3064 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3065
3066 $TICK_WATCHER->at ($NEXT_TICK);
3067 $TICK_WATCHER->start;
3068
3069 $LOAD = ($NOW - $tick_start) / $TICK; 3649 $LOAD = ($NOW - $tick_start) / $TICK;
3070 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3071 3651
3072 _post_tick; 3652 _post_tick;
3073 3653};
3074 3654$TICK_WATCHER->priority (EV::MAXPRI);
3075 },
3076);
3077 3655
3078{ 3656{
3079 BDB::max_poll_time $TICK * 0.1; 3657 # configure BDB
3080 $BDB_POLL_WATCHER = Event->io ( 3658
3081 reentrant => 0,
3082 fd => BDB::poll_fileno,
3083 poll => 'r',
3084 prio => 0,
3085 data => WF_AUTOCANCEL,
3086 cb => \&BDB::poll_cb,
3087 );
3088 BDB::min_parallel 8; 3659 BDB::min_parallel 8;
3089 3660 BDB::max_poll_reqs $TICK * 0.1;
3090 BDB::set_sync_prepare { 3661 $Coro::BDB::WATCHER->priority (1);
3091 my $status;
3092 my $current = $Coro::current;
3093 (
3094 sub {
3095 $status = $!;
3096 $current->ready; undef $current;
3097 },
3098 sub {
3099 Coro::schedule while defined $current;
3100 $! = $status;
3101 },
3102 )
3103 };
3104 3662
3105 unless ($DB_ENV) { 3663 unless ($DB_ENV) {
3106 $DB_ENV = BDB::db_env_create; 3664 $DB_ENV = BDB::db_env_create;
3665 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3666 | BDB::LOG_AUTOREMOVE, 1);
3667 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3668 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3107 3669
3108 cf::sync_job { 3670 cf::sync_job {
3109 eval { 3671 eval {
3110 BDB::db_env_open 3672 BDB::db_env_open
3111 $DB_ENV, 3673 $DB_ENV,
3113 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3675 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3114 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3676 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3115 0666; 3677 0666;
3116 3678
3117 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3679 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3118
3119 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3120 $DB_ENV->set_lk_detect;
3121 }; 3680 };
3122 3681
3123 cf::cleanup "db_env_open(db): $@" if $@; 3682 cf::cleanup "db_env_open(db): $@" if $@;
3124 }; 3683 };
3125 } 3684 }
3685
3686 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3687 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3688 };
3689 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3690 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3691 };
3692 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3693 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3694 };
3126} 3695}
3127 3696
3128{ 3697{
3698 # configure IO::AIO
3699
3129 IO::AIO::min_parallel 8; 3700 IO::AIO::min_parallel 8;
3130
3131 undef $Coro::AIO::WATCHER;
3132 IO::AIO::max_poll_time $TICK * 0.1; 3701 IO::AIO::max_poll_time $TICK * 0.1;
3133 $AIO_POLL_WATCHER = Event->io ( 3702 $Coro::AIO::WATCHER->priority (1);
3134 reentrant => 0,
3135 data => WF_AUTOCANCEL,
3136 fd => IO::AIO::poll_fileno,
3137 poll => 'r',
3138 prio => 6,
3139 cb => \&IO::AIO::poll_cb,
3140 );
3141} 3703}
3142 3704
3143my $_log_backtrace; 3705my $_log_backtrace;
3144 3706
3145sub _log_backtrace { 3707sub _log_backtrace {
3149 3711
3150 # limit the # of concurrent backtraces 3712 # limit the # of concurrent backtraces
3151 if ($_log_backtrace < 2) { 3713 if ($_log_backtrace < 2) {
3152 ++$_log_backtrace; 3714 ++$_log_backtrace;
3153 async { 3715 async {
3716 $Coro::current->{desc} = "abt $msg";
3717
3154 my @bt = fork_call { 3718 my @bt = fork_call {
3155 @addr = map { sprintf "%x", $_ } @addr; 3719 @addr = map { sprintf "%x", $_ } @addr;
3156 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3720 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3157 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3721 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3158 or die "addr2line: $!"; 3722 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines