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.300 by root, Tue Jul 10 06:44:29 2007 UTC vs.
Revision 1.414 by root, Thu Apr 10 09:10:45 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
46use Coro::Util ();
24 47
25use JSON::XS 1.4 (); 48use JSON::XS 2.01 ();
26use BDB (); 49use BDB ();
27use Data::Dumper; 50use Data::Dumper;
28use Digest::MD5; 51use Digest::MD5;
29use Fcntl; 52use Fcntl;
30use YAML::Syck (); 53use YAML ();
31use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
32use Time::HiRes; 55use Time::HiRes;
33use Compress::LZF; 56use Compress::LZF;
57use Digest::MD5 ();
34 58
35# configure various modules to our taste 59# configure various modules to our taste
36# 60#
37$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45 64
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 66
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 68
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
73 93
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 97our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
81 99
82our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 104our $DB_ENV;
84 105
85our %CFG; 106our %CFG;
86 107
87our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 109our $RUNTIME;
110our $NOW;
89 111
90our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
93 115
94# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 118
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
100 123
101binmode STDOUT; 124binmode STDOUT;
102binmode STDERR; 125binmode STDERR;
103 126
104# read virtual server time, if available 127# read virtual server time, if available
157 180
158The raw value load value from the last tick. 181The raw value load value from the last tick.
159 182
160=item %cf::CFG 183=item %cf::CFG
161 184
162Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 186from wherever your confdir points to.
164 187
165=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
166 189
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 191returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 192per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 193
194=item @cf::INVOKE_RESULTS
195
196This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call.
199
171=back 200=back
172 201
173=cut 202=cut
174 203
175BEGIN { 204BEGIN {
179 $msg .= "\n" 208 $msg .= "\n"
180 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
181 210
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183 212
184 utf8::encode $msg;
185 LOG llevError, $msg; 213 LOG llevError, $msg;
186 }; 214 };
187} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
188 231
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
205)) { 248)) {
206 no strict 'refs'; 249 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 251}
209 252
210$Event::DIED = sub { 253$EV::DIED = sub {
211 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
212}; 255};
213 256
214############################################################################# 257#############################################################################
215 258
238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
239 $d 282 $d
240 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
241} 284}
242 285
243=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
244 287
245Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
246 289
247=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
248 291
249Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
250 293
251=cut 294=cut
252 295
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 297
255sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
257 300
258=item cf::lock_wait $string 301=item cf::lock_wait $string
259 302
260Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
261 304
264Wait until the given lock is available and then acquires it and returns 307Wait until the given lock is available and then acquires it and returns
265a Coro::guard object. If the guard object gets destroyed (goes out of scope, 308a Coro::guard object. If the guard object gets destroyed (goes out of scope,
266for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
267returned. 310returned.
268 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
269Lock names should begin with a unique identifier (for example, cf::map::find 315Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
271 317
272=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
273 319
274Return true if the lock is currently active, i.e. somebody has locked it. 320Return true if the lock is currently active, i.e. somebody has locked it.
275 321
276=cut 322=cut
277 323
278our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
279 326
280sub lock_wait($) { 327sub lock_wait($) {
281 my ($key) = @_; 328 my ($key) = @_;
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
282 334
283 # wait for lock, if any 335 # wait for lock, if any
284 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 338 Coro::schedule;
292 344
293 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
294 lock_wait $key; 346 lock_wait $key;
295 347
296 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
297 350
298 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
301 } 355 }
302} 356}
303 357
306 360
307 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
308} 362}
309 363
310sub freeze_mainloop { 364sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
312 366
313 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
314 $TICK_WATCHER->start; 368}
369
370=item cf::periodic $interval, $cb
371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
383}
384
385=item cf::get_slot $time[, $priority[, $name]]
386
387Allocate $time seconds of blocking CPU time at priority C<$priority>:
388This call blocks and returns only when you have at least C<$time> seconds
389of cpu time till the next tick. The slot is only valid till the next cede.
390
391The optional C<$name> can be used to identify the job to run. It might be
392used for statistical purposes and should identify the same time-class.
393
394Useful for short background jobs.
395
396=cut
397
398our @SLOT_QUEUE;
399our $SLOT_QUEUE;
400
401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
405 my $signal = new Coro::Signal;
406
407 while () {
408 next_job:
409 my $avail = cf::till_tick;
410 if ($avail > 0.01) {
411 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) {
413 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send;
415 Coro::cede;
416 goto next_job;
417 }
418 }
419 }
420
421 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait;
425 } else {
426 Coro::schedule;
427 }
315 }; 428 }
316 $TICK_WATCHER->stop; 429};
317 $guard 430
431sub get_slot($;$$) {
432 my ($time, $pri, $name) = @_;
433
434 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal;
436
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready;
440 $sig->wait;
318} 441}
319 442
320=item cf::async { BLOCK } 443=item cf::async { BLOCK }
321 444
322Currently the same as Coro::async_pool, meaning you cannot use 445Currently the same as Coro::async_pool, meaning you cannot use
327 450
328BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
329 452
330=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
331 454
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 456is always able to handle events or runnable, as Deliantra is only
334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 457partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 458acceptable.
336 459
337If it must be done, put the blocking parts into C<sync_job>. This will run 460If it must be done, put the blocking parts into C<sync_job>. This will run
338the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
343 466
344sub sync_job(&) { 467sub sync_job(&) {
345 my ($job) = @_; 468 my ($job) = @_;
346 469
347 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 471 my $time = EV::time;
349 472
350 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
352 475
353 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 477
355 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
356 479
357 my $busy = 1; 480 my $busy = 1;
358 my @res; 481 my @res;
359 482
360 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 485 @res = eval { $job->() };
362 warn $@ if $@; 486 warn $@ if $@;
363 undef $busy; 487 undef $busy;
364 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
365 489
366 while ($busy) { 490 while ($busy) {
367 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
368 } 495 }
496 }
369 497
370 $time = Event::time - $time; 498 my $time = EV::time - $time;
371 499
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
376 501
377 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
378 } else { 503 } else {
379 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
380 505
405=item fork_call { }, $args 530=item fork_call { }, $args
406 531
407Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
411 536
412=cut 537=cut
413
414sub _store_scalar {
415 open my $fh, ">", \my $buf
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421}
422 538
423sub fork_call(&@) { 539sub fork_call(&@) {
424 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
425 541
426# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 542 # we seemingly have to make a local copy of the whole thing,
427# or die "socketpair: $!"; 543 # otherwise perl prematurely frees the stuff :/
428 pipe my $fh1, my $fh2 544 # TODO: investigate and fix (likely this will be rather laborious)
429 or die "pipe: $!";
430 545
431 if (my $pid = fork) { 546 my @res = Coro::Util::fork_eval {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals; 547 reset_signals;
445 local $SIG{__WARN__}; 548 &$cb
446 local $SIG{__DIE__}; 549 }, @args;
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452 550
453 eval { 551 wantarray ? @res : $res[-1]
454 close $fh1;
455
456 my @res = eval { $cb->(@args) };
457
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459 close $fh2;
460 };
461
462 warn $@ if $@;
463 _exit 0;
464 }
465} 552}
466 553
467=item $value = cf::db_get $family => $key 554=item $value = cf::db_get $family => $key
468 555
469Returns a single value from the environment database. 556Returns a single value from the environment database.
471=item cf::db_put $family => $key => $value 558=item cf::db_put $family => $key => $value
472 559
473Stores the given C<$value> in the family. It can currently store binary 560Stores the given C<$value> in the family. It can currently store binary
474data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 561data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
475 562
563=item $db = cf::db_table "name"
564
565Create and/or open a new database table. The string must not be "db" and must be unique
566within each server.
567
476=cut 568=cut
569
570sub db_table($) {
571 my ($name) = @_;
572 my $db = BDB::db_create $DB_ENV;
573
574 eval {
575 $db->set_flags (BDB::CHKSUM);
576
577 utf8::encode $name;
578 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
579 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
580 cf::cleanup "db_open(db): $!" if $!;
581 };
582 cf::cleanup "db_open(db): $@" if $@;
583
584 $db
585}
477 586
478our $DB; 587our $DB;
479 588
480sub db_init { 589sub db_init {
481 unless ($DB) {
482 $DB = BDB::db_create $DB_ENV;
483
484 cf::sync_job { 590 cf::sync_job {
485 eval { 591 $DB ||= db_table "db";
486 $DB->set_flags (BDB::CHKSUM);
487
488 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
489 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
490 cf::cleanup "db_open(db): $!" if $!;
491 };
492 cf::cleanup "db_open(db): $@" if $@;
493 };
494 } 592 };
495} 593}
496 594
497sub db_get($$) { 595sub db_get($$) {
498 my $key = "$_[0]/$_[1]"; 596 my $key = "$_[0]/$_[1]";
499 597
549 if (1) { 647 if (1) {
550 $md5 = 648 $md5 =
551 join "\x00", 649 join "\x00",
552 $processversion, 650 $processversion,
553 map { 651 map {
554 Coro::cede; 652 cf::cede_to_tick;
555 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 653 ($src->[$_], Digest::MD5::md5_hex $data[$_])
556 } 0.. $#$src; 654 } 0.. $#$src;
557 655
558 656
559 my $dbmd5 = db_get cache => "$id/md5"; 657 my $dbmd5 = db_get cache => "$id/md5";
603attach callbacks/event handlers (a collection of which is called an "attachment") 701attach callbacks/event handlers (a collection of which is called an "attachment")
604to it. All such attachable objects support the following methods. 702to it. All such attachable objects support the following methods.
605 703
606In the following description, CLASS can be any of C<global>, C<object> 704In the following description, CLASS can be any of C<global>, C<object>
607C<player>, C<client> or C<map> (i.e. the attachable objects in 705C<player>, C<client> or C<map> (i.e. the attachable objects in
608Crossfire TRT). 706Deliantra).
609 707
610=over 4 708=over 4
611 709
612=item $attachable->attach ($attachment, key => $value...) 710=item $attachable->attach ($attachment, key => $value...)
613 711
865 "; 963 ";
866 die if $@; 964 die if $@;
867} 965}
868 966
869our $override; 967our $override;
870our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 968our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
871 969
872sub override { 970sub override {
873 $override = 1; 971 $override = 1;
874 @invoke_results = (); 972 @INVOKE_RESULTS = (@_);
875} 973}
876 974
877sub do_invoke { 975sub do_invoke {
878 my $event = shift; 976 my $event = shift;
879 my $callbacks = shift; 977 my $callbacks = shift;
880 978
881 @invoke_results = (); 979 @INVOKE_RESULTS = ();
882 980
883 local $override; 981 local $override;
884 982
885 for (@$callbacks) { 983 for (@$callbacks) {
886 eval { &{$_->[1]} }; 984 eval { &{$_->[1]} };
895 } 993 }
896 994
897 0 995 0
898} 996}
899 997
900=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 998=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
901 999
902=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1000=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
903 1001
904Generate an object-specific event with the given arguments. 1002Generate an object-specific event with the given arguments.
905 1003
906This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1004This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
907removed in future versions), and there is no public API to access override 1005removed in future versions), and there is no public API to access override
908results (if you must, access C<@cf::invoke_results> directly). 1006results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 1007
910=back 1008=back
911 1009
912=cut 1010=cut
913 1011
914############################################################################# 1012#############################################################################
915# object support 1013# object support
1014
1015sub _object_equal($$);
1016sub _object_equal($$) {
1017 my ($a, $b) = @_;
1018
1019 return 0 unless (ref $a) eq (ref $b);
1020
1021 if ("HASH" eq ref $a) {
1022 my @ka = keys %$a;
1023 my @kb = keys %$b;
1024
1025 return 0 if @ka != @kb;
1026
1027 for (0 .. $#ka) {
1028 return 0 unless $ka[$_] eq $kb[$_];
1029 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1030 }
1031
1032 } elsif ("ARRAY" eq ref $a) {
1033
1034 return 0 if @$a != @$b;
1035
1036 for (0 .. $#$a) {
1037 return 0 unless _object_equal $a->[$_], $b->[$_];
1038 }
1039
1040 } elsif ($a ne $b) {
1041 return 0;
1042 }
1043
1044 1
1045}
1046
1047our $SLOW_MERGES;#d#
1048sub _can_merge {
1049 my ($ob1, $ob2) = @_;
1050
1051 ++$SLOW_MERGES;#d#
1052
1053 # we do the slow way here
1054 return _object_equal $ob1, $ob2
1055}
916 1056
917sub reattach { 1057sub reattach {
918 # basically do the same as instantiate, without calling instantiate 1058 # basically do the same as instantiate, without calling instantiate
919 my ($obj) = @_; 1059 my ($obj) = @_;
920 1060
941cf::attachable->attach ( 1081cf::attachable->attach (
942 prio => -1000000, 1082 prio => -1000000,
943 on_instantiate => sub { 1083 on_instantiate => sub {
944 my ($obj, $data) = @_; 1084 my ($obj, $data) = @_;
945 1085
946 $data = from_json $data; 1086 $data = decode_json $data;
947 1087
948 for (@$data) { 1088 for (@$data) {
949 my ($name, $args) = @$_; 1089 my ($name, $args) = @$_;
950 1090
951 $obj->attach ($name, %{$args || {} }); 1091 $obj->attach ($name, %{$args || {} });
967sub object_freezer_save { 1107sub object_freezer_save {
968 my ($filename, $rdata, $objs) = @_; 1108 my ($filename, $rdata, $objs) = @_;
969 1109
970 sync_job { 1110 sync_job {
971 if (length $$rdata) { 1111 if (length $$rdata) {
1112 utf8::decode (my $decname = $filename);
972 warn sprintf "saving %s (%d,%d)\n", 1113 warn sprintf "saving %s (%d,%d)\n",
973 $filename, length $$rdata, scalar @$objs; 1114 $decname, length $$rdata, scalar @$objs;
974 1115
975 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
976 chmod SAVE_MODE, $fh; 1117 chmod SAVE_MODE, $fh;
977 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
978 aio_fsync $fh if $cf::USE_FSYNC; 1119 aio_fsync $fh if $cf::USE_FSYNC;
979 close $fh; 1120 close $fh;
980 1121
981 if (@$objs) { 1122 if (@$objs) {
982 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
983 chmod SAVE_MODE, $fh; 1124 chmod SAVE_MODE, $fh;
984 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
985 aio_write $fh, 0, (length $data), $data, 0; 1126 aio_write $fh, 0, (length $data), $data, 0;
986 aio_fsync $fh if $cf::USE_FSYNC; 1127 aio_fsync $fh if $cf::USE_FSYNC;
987 close $fh; 1128 close $fh;
988 aio_rename "$filename.pst~", "$filename.pst"; 1129 aio_rename "$filename.pst~", "$filename.pst";
989 } 1130 }
997 } 1138 }
998 } else { 1139 } else {
999 aio_unlink $filename; 1140 aio_unlink $filename;
1000 aio_unlink "$filename.pst"; 1141 aio_unlink "$filename.pst";
1001 } 1142 }
1002 } 1143 };
1003} 1144}
1004 1145
1005sub object_freezer_as_string { 1146sub object_freezer_as_string {
1006 my ($rdata, $objs) = @_; 1147 my ($rdata, $objs) = @_;
1007 1148
1019 or return; 1160 or return;
1020 1161
1021 unless (aio_stat "$filename.pst") { 1162 unless (aio_stat "$filename.pst") {
1022 (aio_load "$filename.pst", $av) >= 0 1163 (aio_load "$filename.pst", $av) >= 0
1023 or return; 1164 or return;
1165
1024 $av = eval { (Storable::thaw $av)->{objs} }; 1166 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs};
1025 } 1168 }
1026 1169
1170 utf8::decode (my $decname = $filename);
1027 warn sprintf "loading %s (%d)\n", 1171 warn sprintf "loading %s (%d,%d)\n",
1028 $filename, length $data, scalar @{$av || []}; 1172 $decname, length $data, scalar @{$av || []};
1173
1029 return ($data, $av); 1174 ($data, $av)
1030} 1175}
1031 1176
1032=head2 COMMAND CALLBACKS 1177=head2 COMMAND CALLBACKS
1033 1178
1034=over 4 1179=over 4
1107 my ($pl, $buf) = @_; 1252 my ($pl, $buf) = @_;
1108 1253
1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1254 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110 1255
1111 if (ref $msg) { 1256 if (ref $msg) {
1257 my ($type, $reply, @payload) =
1258 "ARRAY" eq ref $msg
1259 ? @$msg
1260 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1261
1262 my @reply;
1263
1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1264 if (my $cb = $EXTCMD{$type}) {
1113 if (my %reply = $cb->($pl, $msg)) { 1265 @reply = $cb->($pl, @payload);
1114 $pl->ext_reply ($msg->{msgid}, %reply);
1115 }
1116 } 1266 }
1267
1268 $pl->ext_reply ($reply, @reply)
1269 if $reply;
1270
1117 } else { 1271 } else {
1118 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1272 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119 } 1273 }
1120 1274
1121 cf::override; 1275 cf::override;
1174 my $msg = $@ ? "$v->{path}: $@\n" 1328 my $msg = $@ ? "$v->{path}: $@\n"
1175 : "$v->{base}: extension inactive.\n"; 1329 : "$v->{base}: extension inactive.\n";
1176 1330
1177 if (exists $v->{meta}{mandatory}) { 1331 if (exists $v->{meta}{mandatory}) {
1178 warn $msg; 1332 warn $msg;
1179 warn "mandatory extension failed to load, exiting.\n"; 1333 cf::cleanup "mandatory extension failed to load, exiting.";
1180 exit 1;
1181 } 1334 }
1182 1335
1183 warn $msg; 1336 warn $msg;
1184 } 1337 }
1185 1338
1210use Coro::AIO; 1363use Coro::AIO;
1211 1364
1212=head3 cf::player 1365=head3 cf::player
1213 1366
1214=over 4 1367=over 4
1368
1369=item cf::player::num_playing
1370
1371Returns the official number of playing players, as per the Crossfire metaserver rules.
1372
1373=cut
1374
1375sub num_playing {
1376 scalar grep
1377 $_->ob->map
1378 && !$_->hidden
1379 && !$_->ob->flag (cf::FLAG_WIZ),
1380 cf::player::list
1381}
1215 1382
1216=item cf::player::find $login 1383=item cf::player::find $login
1217 1384
1218Returns the given player object, loading it if necessary (might block). 1385Returns the given player object, loading it if necessary (might block).
1219 1386
1255 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1422 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1423 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1424 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258 aio_unlink +(playerdir $login) . "/$login.pl"; 1425 aio_unlink +(playerdir $login) . "/$login.pl";
1259 1426
1260 my $pl = load_pl path $login 1427 my $f = new_from_file cf::object::thawer path $login
1261 or return; 1428 or return;
1429
1430 my $pl = cf::player::load_pl $f
1431 or return;
1432 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs;
1262 $cf::PLAYER{$login} = $pl 1434 $cf::PLAYER{$login} = $pl
1263 } 1435 }
1264 } 1436 }
1265} 1437}
1266 1438
1276 1448
1277 aio_mkdir playerdir $pl, 0770; 1449 aio_mkdir playerdir $pl, 0770;
1278 $pl->{last_save} = $cf::RUNTIME; 1450 $pl->{last_save} = $cf::RUNTIME;
1279 1451
1280 $pl->save_pl ($path); 1452 $pl->save_pl ($path);
1281 Coro::cede; 1453 cf::cede_to_tick;
1282} 1454}
1283 1455
1284sub new($) { 1456sub new($) {
1285 my ($login) = @_; 1457 my ($login) = @_;
1286 1458
1290 $self->{deny_save} = 1; 1462 $self->{deny_save} = 1;
1291 1463
1292 $cf::PLAYER{$login} = $self; 1464 $cf::PLAYER{$login} = $self;
1293 1465
1294 $self 1466 $self
1467}
1468
1469=item $player->send_msg ($channel, $msg, $color, [extra...])
1470
1471=cut
1472
1473sub send_msg {
1474 my $ns = shift->ns
1475 or return;
1476 $ns->send_msg (@_);
1295} 1477}
1296 1478
1297=item $pl->quit_character 1479=item $pl->quit_character
1298 1480
1299Nukes the player without looking back. If logged in, the connection will 1481Nukes the player without looking back. If logged in, the connection will
1354 or return []; 1536 or return [];
1355 1537
1356 my @logins; 1538 my @logins;
1357 1539
1358 for my $login (@$dirs) { 1540 for my $login (@$dirs) {
1541 my $path = path $login;
1542
1543 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") {
1359 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1360 aio_read $fh, 0, 512, my $buf, 0 or next; 1546 aio_read $fh, 0, 512, my $buf, 0 or next;
1361 $buf !~ /^password -------------$/m or next; # official not-valid tag 1547 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 }
1362 1549
1363 utf8::decode $login; 1550 utf8::decode $login;
1364 push @logins, $login; 1551 push @logins, $login;
1365 } 1552 }
1366 1553
1399 1586
1400Expand crossfire pod fragments into protocol xml. 1587Expand crossfire pod fragments into protocol xml.
1401 1588
1402=cut 1589=cut
1403 1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1404sub expand_cfpod { 1602sub expand_cfpod {
1405 ((my $self), (local $_)) = @_; 1603 my ($self, $pod) = @_;
1406 1604
1407 # escape & and < 1605 my $xml;
1408 s/&/&amp;/g;
1409 s/(?<![BIUGH])</&lt;/g;
1410 1606
1411 # this is buggy, it needs to properly take care of nested <'s 1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1412 1610
1413 1 while 1611 $group =~ s/&/&amp;/g;
1414 # replace B<>, I<>, U<> etc. 1612 $group =~ s/</&lt;/g;
1415 s/B<([^\>]*)>/<b>$1<\/b>/ 1613
1416 || s/I<([^\>]*)>/<i>$1<\/i>/ 1614 $xml .= $group;
1417 || s/U<([^\>]*)>/<u>$1<\/u>/ 1615 } elsif ($pod =~ m%\G
1418 # replace G<male|female> tags 1616 ([BCGHITU])
1419 || s{G<([^>|]*)\|([^>]*)>}{ 1617 <
1420 $self->gender ? $2 : $1 1618 (?:
1421 }ge 1619 ([^<>]*) (?{ $group = $^N })
1422 # replace H<hint text> 1620 | < $interior >
1423 || s{H<([^\>]*)>} 1621 )
1622 >
1623 %gcsx
1424 { 1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1425 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1426 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1427 "") 1644 "")
1428 [$self->{hintmode}] 1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1429 }ge; 1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1430 1656
1657 for ($xml) {
1431 # create single paragraphs (very hackish) 1658 # create single paragraphs (very hackish)
1432 s/(?<=\S)\n(?=\w)/ /g; 1659 s/(?<=\S)\n(?=\w)/ /g;
1433 1660
1434 # compress some whitespace 1661 # compress some whitespace
1435 s/\s+\n/\n/g; # ws line-ends 1662 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines 1663 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines 1664 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines 1665 s/\n+$//; # ending lines
1666 }
1439 1667
1440 warn $_;#d# 1668 $xml
1441 $_
1442} 1669}
1670
1671no re 'eval';
1443 1672
1444sub hintmode { 1673sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1675 $_[0]{hintmode}
1447} 1676}
1448 1677
1449=item $player->ext_reply ($msgid, %msg) 1678=item $player->ext_reply ($msgid, @msg)
1450 1679
1451Sends an ext reply to the player. 1680Sends an ext reply to the player.
1452 1681
1453=cut 1682=cut
1454 1683
1455sub ext_reply($$%) { 1684sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1685 my ($self, $id, @msg) = @_;
1457 1686
1458 $msg{msgid} = $id; 1687 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1688}
1461 1689
1462=item $player->ext_event ($type, %msg) 1690=item $player->ext_msg ($type, @msg)
1463 1691
1464Sends an ext event to the client. 1692Sends an ext event to the client.
1465 1693
1466=cut 1694=cut
1467 1695
1468sub ext_event($$%) { 1696sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1697 my ($self, $type, @msg) = @_;
1470 1698
1471 $self->ns->ext_event ($type, %msg); 1699 $self->ns->ext_msg ($type, @msg);
1472} 1700}
1473 1701
1474=head3 cf::region 1702=head3 cf::region
1475 1703
1476=over 4 1704=over 4
1489 my ($path) = @_; 1717 my ($path) = @_;
1490 1718
1491 my ($match, $specificity); 1719 my ($match, $specificity);
1492 1720
1493 for my $region (list) { 1721 for my $region (list) {
1494 if ($region->match && $path =~ $region->match) { 1722 if ($region->{match} && $path =~ $region->{match}) {
1495 ($match, $specificity) = ($region, $region->specificity) 1723 ($match, $specificity) = ($region, $region->specificity)
1496 if $region->specificity > $specificity; 1724 if $region->specificity > $specificity;
1497 } 1725 }
1498 } 1726 }
1499 1727
1619 $self->init; # pass $1 etc. 1847 $self->init; # pass $1 etc.
1620 return $self; 1848 return $self;
1621 } 1849 }
1622 } 1850 }
1623 1851
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1852 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1853 ()
1626} 1854}
1627 1855
1628sub init { 1856sub init {
1629 my ($self) = @_; 1857 my ($self) = @_;
1692 1920
1693sub load_header_from($) { 1921sub load_header_from($) {
1694 my ($self, $path) = @_; 1922 my ($self, $path) = @_;
1695 1923
1696 utf8::encode $path; 1924 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1925 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 or return; 1926 or return;
1927
1928 $self->_load_header ($f)
1929 or return;
1930
1931 local $MAP_LOADING{$self->{path}} = $self;
1932 $f->resolve_delayed_derefs;
1702 1933
1703 $self->{load_path} = $path; 1934 $self->{load_path} = $path;
1704 1935
1705 1 1936 1
1706} 1937}
1760sub find { 1991sub find {
1761 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
1762 1993
1763 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
1764 1995
1996 cf::lock_wait "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 1997 cf::lock_wait "map_find:$path";
1766 1998
1767 $cf::MAP{$path} || do { 1999 $cf::MAP{$path} || do {
1768 my $guard = cf::lock_acquire "map_find:$path"; 2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
1769 my $map = new_from_path cf::map $path 2003 my $map = new_from_path cf::map $path
1770 or return; 2004 or return;
1771 2005
1772 $map->{last_save} = $cf::RUNTIME; 2006 $map->{last_save} = $cf::RUNTIME;
1773 2007
1775 or return; 2009 or return;
1776 2010
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 2012 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 2013 #$cf::WAIT_FOR_TICK->wait;
2014 undef $guard1;
2015 undef $guard2;
1780 $map->reset; 2016 $map->reset;
1781 undef $guard;
1782 return find $path; 2017 return find $path;
1783 } 2018 }
1784 2019
1785 $cf::MAP{$path} = $map 2020 $cf::MAP{$path} = $map
1786 } 2021 }
1795 local $self->{deny_reset} = 1; # loading can take a long time 2030 local $self->{deny_reset} = 1; # loading can take a long time
1796 2031
1797 my $path = $self->{path}; 2032 my $path = $self->{path};
1798 2033
1799 { 2034 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2035 my $guard = cf::lock_acquire "map_data:$path";
1801 2036
2037 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2038 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2039
1804 $self->in_memory (cf::MAP_LOADING); 2040 $self->in_memory (cf::MAP_LOADING);
1805 2041
1806 $self->alloc; 2042 $self->alloc;
1807 2043
1808 $self->pre_load; 2044 $self->pre_load;
1809 Coro::cede; 2045 cf::cede_to_tick;
1810 2046
2047 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2049 $self->_load_objects ($f)
1812 or return; 2050 or return;
1813 2051
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815 if delete $self->{load_original}; 2053 if delete $self->{load_original};
1816 2054
1817 if (my $uniq = $self->uniq_path) { 2055 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2056 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2057 unless (aio_stat $uniq) {
2058 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2059 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2060 $self->_load_objects ($f);
2061 $f->resolve_delayed_derefs;
2062 }
1822 } 2063 }
1823 } 2064 }
1824 2065
1825 Coro::cede; 2066 $f->resolve_delayed_derefs;
2067
2068 cf::cede_to_tick;
1826 # now do the right thing for maps 2069 # now do the right thing for maps
1827 $self->link_multipart_objects; 2070 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2071 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2072 unless $self->difficulty;
1830 Coro::cede; 2073 cf::cede_to_tick;
1831 2074
1832 unless ($self->{deny_activate}) { 2075 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2076 $self->decay_objects;
1834 $self->fix_auto_apply; 2077 $self->fix_auto_apply;
1835 $self->update_buttons; 2078 $self->update_buttons;
1836 Coro::cede; 2079 cf::cede_to_tick;
1837 $self->set_darkness_map; 2080 $self->set_darkness_map;
1838 Coro::cede; 2081 cf::cede_to_tick;
1839 $self->activate; 2082 $self->activate;
1840 } 2083 }
2084
2085 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME);
1841 2087
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2088 $self->in_memory (cf::MAP_IN_MEMORY);
1843 } 2089 }
1844 2090
1845 $self->post_load; 2091 $self->post_load;
1856 2102
1857 $self 2103 $self
1858} 2104}
1859 2105
1860# find and load all maps in the 3x3 area around a map 2106# find and load all maps in the 3x3 area around a map
1861sub load_diag { 2107sub load_neighbours {
1862 my ($map) = @_; 2108 my ($map) = @_;
1863 2109
1864 my @diag; # diagonal neighbours 2110 my @neigh; # diagonal neighbours
1865 2111
1866 for (0 .. 3) { 2112 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2113 my $neigh = $map->tile_path ($_)
1868 or next; 2114 or next;
1869 $neigh = find $neigh, $map 2115 $neigh = find $neigh, $map
1870 or next; 2116 or next;
1871 $neigh->load; 2117 $neigh->load;
1872 2118
2119 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2120 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2121 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2122 }
1876 2123
1877 for (@diag) { 2124 for (grep defined $_->[0], @neigh) {
2125 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2126 my $neigh = find $path, $origin
1879 or next; 2127 or next;
1880 $neigh->load; 2128 $neigh->load;
1881 } 2129 }
1882} 2130}
1883 2131
1888} 2136}
1889 2137
1890sub do_load_sync { 2138sub do_load_sync {
1891 my ($map) = @_; 2139 my ($map) = @_;
1892 2140
2141 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2142 if $Coro::current == $Coro::main;
2143
1893 cf::sync_job { $map->load }; 2144 cf::sync_job { $map->load };
1894} 2145}
1895 2146
1896our %MAP_PREFETCH; 2147our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2148our $MAP_PREFETCHER = undef;
1898 2149
1899sub find_async { 2150sub find_async {
1900 my ($path, $origin) = @_; 2151 my ($path, $origin, $load) = @_;
1901 2152
1902 $path = normalise $path, $origin && $origin->{path}; 2153 $path = normalise $path, $origin && $origin->{path};
1903 2154
1904 if (my $map = $cf::MAP{$path}) { 2155 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1906 } 2157 }
1907 2158
1908 undef $MAP_PREFETCH{$path}; 2159 $MAP_PREFETCH{$path} |= $load;
2160
1909 $MAP_PREFETCHER ||= cf::async { 2161 $MAP_PREFETCHER ||= cf::async {
2162 $Coro::current->{desc} = "map prefetcher";
2163
1910 while (%MAP_PREFETCH) { 2164 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2165 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 2166 if (my $map = find $k) {
1913 or next;
1914 $map->load; 2167 $map->load if $v;
2168 }
1915 2169
1916 delete $MAP_PREFETCH{$path}; 2170 delete $MAP_PREFETCH{$k};
1917 } 2171 }
1918 } 2172 }
1919 undef $MAP_PREFETCHER; 2173 undef $MAP_PREFETCHER;
1920 }; 2174 };
1921 $MAP_PREFETCHER->prio (6); 2175 $MAP_PREFETCHER->prio (6);
1924} 2178}
1925 2179
1926sub save { 2180sub save {
1927 my ($self) = @_; 2181 my ($self) = @_;
1928 2182
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2184
1931 $self->{last_save} = $cf::RUNTIME; 2185 $self->{last_save} = $cf::RUNTIME;
1932 2186
1933 return unless $self->dirty; 2187 return unless $self->dirty;
1934 2188
1940 return if $self->{deny_save}; 2194 return if $self->{deny_save};
1941 2195
1942 local $self->{last_access} = $self->last_access;#d# 2196 local $self->{last_access} = $self->last_access;#d#
1943 2197
1944 cf::async { 2198 cf::async {
2199 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2200 $_->contr->save for $self->players;
1946 }; 2201 };
1947 2202
1948 if ($uniq) { 2203 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1957 my ($self) = @_; 2212 my ($self) = @_;
1958 2213
1959 # save first because save cedes 2214 # save first because save cedes
1960 $self->save; 2215 $self->save;
1961 2216
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2218
1964 return if $self->players; 2219 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2220 return if $self->in_memory != cf::MAP_IN_MEMORY;
1966 return if $self->{deny_save}; 2221 return if $self->{deny_save};
1967 2222
2223 $self->in_memory (cf::MAP_SWAPPED);
2224
2225 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2227 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2228}
1971 2229
1972sub reset_at { 2230sub reset_at {
1973 my ($self) = @_; 2231 my ($self) = @_;
1974 2232
2006 if $uniq; 2264 if $uniq;
2007 } 2265 }
2008 2266
2009 delete $cf::MAP{$self->path}; 2267 delete $cf::MAP{$self->path};
2010 2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2271 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2272
2015 $self->unlink_save; 2273 $self->unlink_save;
2016 $self->destroy; 2274 $self->destroy;
2017} 2275}
2018 2276
2019my $nuke_counter = "aaaa"; 2277my $nuke_counter = "aaaa";
2020 2278
2021sub nuke { 2279sub nuke {
2022 my ($self) = @_; 2280 my ($self) = @_;
2023 2281
2282 {
2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2284
2024 delete $cf::MAP{$self->path}; 2285 delete $cf::MAP{$self->path};
2025 2286
2026 $self->unlink_save; 2287 $self->unlink_save;
2027 2288
2028 bless $self, "cf::map"; 2289 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2290 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2291 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2292 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2293 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2294
2034 $cf::MAP{$self->path} = $self; 2295 $cf::MAP{$self->path} = $self;
2296 }
2035 2297
2036 $self->reset; # polite request, might not happen 2298 $self->reset; # polite request, might not happen
2037} 2299}
2038 2300
2039=item $maps = cf::map::tmp_maps 2301=item $maps = cf::map::tmp_maps
2115 2377
2116sub inv_recursive { 2378sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2379 inv_recursive_ inv $_[0]
2118} 2380}
2119 2381
2382=item $ref = $ob->ref
2383
2384creates and returns a persistent reference to an objetc that can be stored as a string.
2385
2386=item $ob = cf::object::deref ($refstring)
2387
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block.
2390
2391=cut
2392
2393sub deref {
2394 my ($ref) = @_;
2395
2396 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2397 my ($uuid, $name) = ($1, $2);
2398 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2399 or return;
2400 $pl->ob->uuid eq $uuid
2401 or return;
2402
2403 $pl->ob
2404 } else {
2405 warn "$ref: cannot resolve object reference\n";
2406 undef
2407 }
2408}
2409
2120package cf; 2410package cf;
2121 2411
2122=back 2412=back
2123 2413
2124=head3 cf::object::player 2414=head3 cf::object::player
2146 2436
2147 } else { 2437 } else {
2148 my $pl = $self->contr; 2438 my $pl = $self->contr;
2149 2439
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2440 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2441 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2443
2159 } else { 2444 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2445 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2446 $self->message ($msg, $flags);
2162 } 2447 }
2163 } 2448 }
2449}
2450
2451=item $object->send_msg ($channel, $msg, $color, [extra...])
2452
2453=cut
2454
2455sub cf::object::send_msg {
2456 my $pl = shift->contr
2457 or return;
2458 $pl->send_msg (@_);
2164} 2459}
2165 2460
2166=item $player_object->may ("access") 2461=item $player_object->may ("access")
2167 2462
2168Returns wether the given player is authorized to access resource "access" 2463Returns wether the given player is authorized to access resource "access"
2247 # use -1 or undef as default coordinates, not 0, 0 2542 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2543 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2544 if $x <=0 && $y <= 0;
2250 2545
2251 $map->load; 2546 $map->load;
2252 $map->load_diag; 2547 $map->load_neighbours;
2253 2548
2254 return unless $self->contr->active; 2549 return unless $self->contr->active;
2255 $self->activate_recursive; 2550 $self->activate_recursive;
2256 2551
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2553 $self->enter_map ($map, $x, $y);
2259} 2554}
2260 2555
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2556=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2557
2263Moves the player to the given map-path and coordinates by first freezing 2558Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback 2559her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2560that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. 2561the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process.
2267 2563
2268=cut 2564=cut
2269 2565
2270our $GOTOGEN; 2566our $GOTOGEN;
2271 2567
2272sub cf::object::player::goto { 2568sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2569 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2570
2275 # do generation counting so two concurrent goto's will be executed in-order 2571 # do generation counting so two concurrent goto's will be executed in-order
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2573
2278 $self->enter_link; 2574 $self->enter_link;
2279 2575
2280 (async { 2576 (async {
2577 $Coro::current->{desc} = "player::goto $path $x $y";
2578
2579 # *tag paths override both path and x|y
2580 if ($path =~ /^\*(.*)$/) {
2581 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2582 my $ob = $obs[rand @obs];
2583
2584 # see if we actually can go there
2585 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2586 $ob = $obs[rand @obs];
2587 } else {
2588 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 }
2590 # else put us there anyways for now #d#
2591
2592 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2593 } else {
2594 ($path, $x, $y) = (undef, undef, undef);
2595 }
2596 }
2597
2281 my $map = eval { 2598 my $map = eval {
2282 my $map = cf::map::find $path; 2599 my $map = defined $path ? cf::map::find $path : undef;
2283 2600
2284 if ($map) { 2601 if ($map) {
2285 $map = $map->customise_for ($self); 2602 $map = $map->customise_for ($self);
2286 $map = $check->($map) if $check && $map; 2603 $map = $check->($map) if $check && $map;
2287 } else { 2604 } else {
2288 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2605 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2289 } 2606 }
2290 2607
2291 $map 2608 $map
2292 }; 2609 };
2293 2610
2298 2615
2299 if ($gen == $self->{_goto_generation}) { 2616 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2617 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2618 $self->leave_link ($map, $x, $y);
2302 } 2619 }
2620
2621 $done->() if $done;
2303 })->prio (1); 2622 })->prio (1);
2304} 2623}
2305 2624
2306=item $player_object->enter_exit ($exit_object) 2625=item $player_object->enter_exit ($exit_object)
2307 2626
2344 $rmp->{origin_y} = $exit->y; 2663 $rmp->{origin_y} = $exit->y;
2345 } 2664 }
2346 2665
2347 $rmp->{random_seed} ||= $exit->random_seed; 2666 $rmp->{random_seed} ||= $exit->random_seed;
2348 2667
2349 my $data = cf::to_json $rmp; 2668 my $data = cf::encode_json $rmp;
2350 my $md5 = Digest::MD5::md5_hex $data; 2669 my $md5 = Digest::MD5::md5_hex $data;
2351 my $meta = "$RANDOMDIR/$md5.meta"; 2670 my $meta = "$RANDOMDIR/$md5.meta";
2352 2671
2353 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2354 aio_write $fh, 0, (length $data), $data, 0; 2673 aio_write $fh, 0, (length $data), $data, 0;
2381 # if exit is damned, update players death & WoR home-position 2700 # if exit is damned, update players death & WoR home-position
2382 $self->contr->savebed ($slaying, $hp, $sp) 2701 $self->contr->savebed ($slaying, $hp, $sp)
2383 if $exit->flag (FLAG_DAMNED); 2702 if $exit->flag (FLAG_DAMNED);
2384 2703
2385 (async { 2704 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2706
2386 $self->deactivate_recursive; # just to be sure 2707 $self->deactivate_recursive; # just to be sure
2387 unless (eval { 2708 unless (eval {
2388 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($slaying, $hp, $sp);
2389 2710
2390 1; 2711 1;
2416 2737
2417 utf8::encode $text; 2738 utf8::encode $text;
2418 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2419} 2740}
2420 2741
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2742=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2743
2423Send a drawinfo or msg packet to the client, formatting the msg for the 2744Send a drawinfo or msg packet to the client, formatting the msg for the
2424client if neccessary. C<$type> should be a string identifying the type of 2745client if neccessary. C<$type> should be a string identifying the type of
2425the message, with C<log> being the default. If C<$color> is negative, suppress 2746the message, with C<log> being the default. If C<$color> is negative, suppress
2426the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2427 2748
2428=cut 2749=cut
2429 2750
2751# non-persistent channels (usually the info channel)
2752our %CHANNEL = (
2753 "c/identify" => {
2754 id => "infobox",
2755 title => "Identify",
2756 reply => undef,
2757 tooltip => "Items recently identified",
2758 },
2759 "c/examine" => {
2760 id => "infobox",
2761 title => "Examine",
2762 reply => undef,
2763 tooltip => "Signs and other items you examined",
2764 },
2765 "c/book" => {
2766 id => "infobox",
2767 title => "Book",
2768 reply => undef,
2769 tooltip => "The contents of a note or book",
2770 },
2771 "c/lookat" => {
2772 id => "infobox",
2773 title => "Look",
2774 reply => undef,
2775 tooltip => "What you saw there",
2776 },
2777 "c/who" => {
2778 id => "infobox",
2779 title => "Players",
2780 reply => undef,
2781 tooltip => "Shows players who are currently online",
2782 },
2783 "c/body" => {
2784 id => "infobox",
2785 title => "Body Parts",
2786 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available",
2788 },
2789 "c/uptime" => {
2790 id => "infobox",
2791 title => "Uptime",
2792 reply => undef,
2793 tooltip => "How long the server has been running since last restart",
2794 },
2795 "c/mapinfo" => {
2796 id => "infobox",
2797 title => "Map Info",
2798 reply => undef,
2799 tooltip => "Information related to the maps",
2800 },
2801);
2802
2430sub cf::client::send_msg { 2803sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2432 2805
2433 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg);
2434 2807
2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809
2810 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel};
2813
2814 $self->ext_msg (channel_info => $channel)
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id};
2818
2819 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel)
2824 if $self->can_msg;
2825 }
2826
2827 $channel = $channel->{id};
2828 }
2829
2435 return unless @extra || length $msg; 2830 return unless @extra || length $msg;
2436 2831
2437 if ($self->can_msg) { 2832 if ($self->can_msg) {
2833 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF;
2836
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2837 $self->send_packet ("msg " . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2439 } else { 2839 } else {
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449
2450 if ($color >= 0) { 2840 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones
2842 for ($msg) {
2843 1 while
2844 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2845 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2846 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2847 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2848 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2849 }
2850
2851 $color &= cf::NDI_COLOR_MASK;
2852
2853 utf8::encode $msg;
2854
2451 if (0 && $msg =~ /\[/) { 2855 if (0 && $msg =~ /\[/) {
2856 # COMMAND/INFO
2452 $self->send_packet ("drawextinfo $color 4 0 $msg") 2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2453 } else { 2858 } else {
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg") 2860 $self->send_packet ("drawinfo $color $msg")
2456 } 2861 }
2457 } 2862 }
2458 } 2863 }
2459} 2864}
2460 2865
2461=item $client->ext_event ($type, %msg) 2866=item $client->ext_msg ($type, @msg)
2462 2867
2463Sends an ext event to the client. 2868Sends an ext event to the client.
2464 2869
2465=cut 2870=cut
2466 2871
2467sub cf::client::ext_event($$%) { 2872sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 2873 my ($self, $type, @msg) = @_;
2469 2874
2875 if ($self->extcmd == 2) {
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2877 } elsif ($self->extcmd == 1) { # TODO: remove
2470 $msg{msgtype} = "event_$type"; 2878 push @msg, msgtype => "event_$type";
2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 }
2881}
2882
2883=item $client->ext_reply ($msgid, @msg)
2884
2885Sends an ext reply to the client.
2886
2887=cut
2888
2889sub cf::client::ext_reply($$@) {
2890 my ($self, $id, @msg) = @_;
2891
2892 if ($self->extcmd == 2) {
2893 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2894 } elsif ($self->extcmd == 1) {
2895 #TODO: version 1, remove
2896 unshift @msg, msgtype => "reply", msgid => $id;
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2898 }
2472} 2899}
2473 2900
2474=item $success = $client->query ($flags, "text", \&cb) 2901=item $success = $client->query ($flags, "text", \&cb)
2475 2902
2476Queues a query to the client, calling the given callback with 2903Queues a query to the client, calling the given callback with
2531 my ($ns, $buf) = @_; 2958 my ($ns, $buf) = @_;
2532 2959
2533 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2960 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534 2961
2535 if (ref $msg) { 2962 if (ref $msg) {
2963 my ($type, $reply, @payload) =
2964 "ARRAY" eq ref $msg
2965 ? @$msg
2966 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2967
2968 my @reply;
2969
2536 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2970 if (my $cb = $EXTICMD{$type}) {
2537 if (my %reply = $cb->($ns, $msg)) { 2971 @reply = $cb->($ns, @payload);
2538 $reply{msgid} = $msg->{msgid};
2539 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540 }
2541 } 2972 }
2973
2974 $ns->ext_reply ($reply, @reply)
2975 if $reply;
2976
2542 } else { 2977 } else {
2543 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2978 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544 } 2979 }
2545 2980
2546 cf::override; 2981 cf::override;
2593our $safe = new Safe "safe"; 3028our $safe = new Safe "safe";
2594our $safe_hole = new Safe::Hole; 3029our $safe_hole = new Safe::Hole;
2595 3030
2596$SIG{FPE} = 'IGNORE'; 3031$SIG{FPE} = 'IGNORE';
2597 3032
2598$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3033$safe->permit_only (Opcode::opset qw(
3034 :base_core :base_mem :base_orig :base_math
3035 grepstart grepwhile mapstart mapwhile
3036 sort time
3037));
2599 3038
2600# here we export the classes and methods available to script code 3039# here we export the classes and methods available to script code
2601 3040
2602=pod 3041=pod
2603 3042
2604The following functions and methods are available within a safe environment: 3043The following functions and methods are available within a safe environment:
2605 3044
2606 cf::object 3045 cf::object
2607 contr pay_amount pay_player map x y force_find force_add 3046 contr pay_amount pay_player map x y force_find force_add destroy
2608 insert remove 3047 insert remove name archname title slaying race decrease_ob_nr
2609 3048
2610 cf::object::player 3049 cf::object::player
2611 player 3050 player
2612 3051
2613 cf::player 3052 cf::player
2618 3057
2619=cut 3058=cut
2620 3059
2621for ( 3060for (
2622 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race
2623 insert remove)], 3063 decrease_ob_nr destroy)],
2624 ["cf::object::player" => qw(player)], 3064 ["cf::object::player" => qw(player)],
2625 ["cf::player" => qw(peaceful)], 3065 ["cf::player" => qw(peaceful)],
2626 ["cf::map" => qw(trigger)], 3066 ["cf::map" => qw(trigger)],
2627) { 3067) {
2628 no strict 'refs'; 3068 no strict 'refs';
2704# the server's init and main functions 3144# the server's init and main functions
2705 3145
2706sub load_facedata($) { 3146sub load_facedata($) {
2707 my ($path) = @_; 3147 my ($path) = @_;
2708 3148
3149 # HACK to clear player env face cache, we need some signal framework
3150 # for this (global event?)
3151 %ext::player_env::MUSIC_FACE_CACHE = ();
3152
3153 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3154
2709 warn "loading facedata from $path\n"; 3155 warn "loading facedata from $path\n";
2710 3156
2711 my $facedata; 3157 my $facedata;
2712 0 < aio_load $path, $facedata 3158 0 < aio_load $path, $facedata
2713 or die "$path: $!"; 3159 or die "$path: $!";
2715 $facedata = Coro::Storable::thaw $facedata; 3161 $facedata = Coro::Storable::thaw $facedata;
2716 3162
2717 $facedata->{version} == 2 3163 $facedata->{version} == 2
2718 or cf::cleanup "$path: version mismatch, cannot proceed."; 3164 or cf::cleanup "$path: version mismatch, cannot proceed.";
2719 3165
3166 # patch in the exptable
3167 $facedata->{resource}{"res/exp_table"} = {
3168 type => FT_RSRC,
3169 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3170 };
3171 cf::cede_to_tick;
3172
2720 { 3173 {
2721 my $faces = $facedata->{faceinfo}; 3174 my $faces = $facedata->{faceinfo};
2722 3175
2723 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2724 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3177 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178
2725 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3179 cf::face::set_visibility $idx, $info->{visibility};
3180 cf::face::set_magicmap $idx, $info->{magicmap};
2726 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2727 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2728 Coro::cede; 3183
3184 cf::cede_to_tick;
2729 } 3185 }
2730 3186
2731 while (my ($face, $info) = each %$faces) { 3187 while (my ($face, $info) = each %$faces) {
2732 next unless $info->{smooth}; 3188 next unless $info->{smooth};
3189
2733 my $idx = cf::face::find $face 3190 my $idx = cf::face::find $face
2734 or next; 3191 or next;
3192
2735 if (my $smooth = cf::face::find $info->{smooth}) { 3193 if (my $smooth = cf::face::find $info->{smooth}) {
3194 cf::face::set_smooth $idx, $smooth;
2736 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2737 } else { 3196 } else {
2738 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3197 warn "smooth face '$info->{smooth}' not found for face '$face'";
2739 } 3198 }
2740 Coro::cede; 3199
3200 cf::cede_to_tick;
2741 } 3201 }
2742 } 3202 }
2743 3203
2744 { 3204 {
2745 my $anims = $facedata->{animinfo}; 3205 my $anims = $facedata->{animinfo};
2746 3206
2747 while (my ($anim, $info) = each %$anims) { 3207 while (my ($anim, $info) = each %$anims) {
2748 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3208 cf::anim::set $anim, $info->{frames}, $info->{facings};
2749 Coro::cede; 3209 cf::cede_to_tick;
2750 } 3210 }
2751 3211
2752 cf::anim::invalidate_all; # d'oh 3212 cf::anim::invalidate_all; # d'oh
2753 } 3213 }
2754 3214
3215 {
3216 # TODO: for gcfclient pleasure, we should give resources
3217 # that gcfclient doesn't grok a >10000 face index.
3218 my $res = $facedata->{resource};
3219
3220 while (my ($name, $info) = each %$res) {
3221 if (defined $info->{type}) {
3222 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3223 my $data;
3224
3225 if ($info->{type} & 1) {
3226 # prepend meta info
3227
3228 my $meta = $enc->encode ({
3229 name => $name,
3230 %{ $info->{meta} || {} },
3231 });
3232
3233 $data = pack "(w/a*)*", $meta, $info->{data};
3234 } else {
3235 $data = $info->{data};
3236 }
3237
3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type};
3240 } else {
3241 $RESOURCE{$name} = $info;
3242 }
3243
3244 cf::cede_to_tick;
3245 }
3246 }
3247
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3249
2755 1 3250 1
2756} 3251}
2757 3252
3253cf::global->attach (on_resource_update => sub {
3254 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3255 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3256
3257 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3258 my $sound = $soundconf->{compat}[$_]
3259 or next;
3260
3261 my $face = cf::face::find "sound/$sound->[1]";
3262 cf::sound::set $sound->[0] => $face;
3263 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3264 }
3265
3266 while (my ($k, $v) = each %{$soundconf->{event}}) {
3267 my $face = cf::face::find "sound/$v";
3268 cf::sound::set $k => $face;
3269 }
3270 }
3271});
3272
3273register_exticmd fx_want => sub {
3274 my ($ns, $want) = @_;
3275
3276 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v);
3278 }
3279};
3280
2758sub reload_regions { 3281sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = ();
3285
2759 load_resource_file "$MAPDIR/regions" 3286 load_resource_file "$MAPDIR/regions"
2760 or die "unable to load regions file\n"; 3287 or die "unable to load regions file\n";
3288
3289 for (cf::region::list) {
3290 $_->{match} = qr/$_->{match}/
3291 if exists $_->{match};
3292 }
2761} 3293}
2762 3294
2763sub reload_facedata { 3295sub reload_facedata {
2764 load_facedata "$DATADIR/facedata" 3296 load_facedata "$DATADIR/facedata"
2765 or die "unable to load facedata\n"; 3297 or die "unable to load facedata\n";
2794 3326
2795sub init { 3327sub init {
2796 reload_resources; 3328 reload_resources;
2797} 3329}
2798 3330
2799sub cfg_load { 3331sub reload_config {
2800 open my $fh, "<:utf8", "$CONFDIR/config" 3332 open my $fh, "<:utf8", "$CONFDIR/config"
2801 or return; 3333 or return;
2802 3334
2803 local $/; 3335 local $/;
2804 *CFG = YAML::Syck::Load <$fh>; 3336 *CFG = YAML::Load <$fh>;
2805 3337
2806 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2807 3339
2808 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3340 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2809 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2820sub main { 3352sub main {
2821 # we must not ever block the main coroutine 3353 # we must not ever block the main coroutine
2822 local $Coro::idle = sub { 3354 local $Coro::idle = sub {
2823 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2824 (async { 3356 (async {
2825 Event::one_event; 3357 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT;
2826 })->prio (Coro::PRIO_MAX); 3359 })->prio (Coro::PRIO_MAX);
2827 }; 3360 };
2828 3361
2829 cfg_load; 3362 reload_config;
2830 db_init; 3363 db_init;
2831 load_extensions; 3364 load_extensions;
2832 3365
2833 $TICK_WATCHER->start; 3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno;
2834 Event::loop; 3368 EV::loop;
2835} 3369}
2836 3370
2837############################################################################# 3371#############################################################################
2838# initialisation and cleanup 3372# initialisation and cleanup
2839 3373
2840# install some emergency cleanup handlers 3374# install some emergency cleanup handlers
2841BEGIN { 3375BEGIN {
3376 our %SIGWATCHER = ();
2842 for my $signal (qw(INT HUP TERM)) { 3377 for my $signal (qw(INT HUP TERM)) {
2843 Event->signal ( 3378 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2844 reentrant => 0,
2845 data => WF_AUTOCANCEL,
2846 signal => $signal,
2847 prio => 0,
2848 cb => sub {
2849 cf::cleanup "SIG$signal"; 3379 cf::cleanup "SIG$signal";
2850 },
2851 ); 3380 };
2852 } 3381 }
2853} 3382}
2854 3383
2855sub write_runtime { 3384sub write_runtime {
2856 my $runtime = "$LOCALDIR/runtime"; 3385 my $runtime = "$LOCALDIR/runtime";
2901 # and maps saved/destroyed asynchronously. 3430 # and maps saved/destroyed asynchronously.
2902 warn "begin emergency player save\n"; 3431 warn "begin emergency player save\n";
2903 for my $login (keys %cf::PLAYER) { 3432 for my $login (keys %cf::PLAYER) {
2904 my $pl = $cf::PLAYER{$login} or next; 3433 my $pl = $cf::PLAYER{$login} or next;
2905 $pl->valid or next; 3434 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2906 $pl->save; 3436 $pl->save;
2907 } 3437 }
2908 warn "end emergency player save\n"; 3438 warn "end emergency player save\n";
2909 3439
2910 warn "begin emergency map save\n"; 3440 warn "begin emergency map save\n";
2949 warn "syncing database to disk"; 3479 warn "syncing database to disk";
2950 BDB::db_env_txn_checkpoint $DB_ENV; 3480 BDB::db_env_txn_checkpoint $DB_ENV;
2951 3481
2952 # if anything goes wrong in here, we should simply crash as we already saved 3482 # if anything goes wrong in here, we should simply crash as we already saved
2953 3483
2954 warn "cancelling all WF_AUTOCANCEL watchers";
2955 for (Event::all_watchers) {
2956 $_->cancel if $_->data & WF_AUTOCANCEL;
2957 }
2958
2959 warn "flushing outstanding aio requests"; 3484 warn "flushing outstanding aio requests";
2960 for (;;) { 3485 for (;;) {
2961 BDB::flush; 3486 BDB::flush;
2962 IO::AIO::flush; 3487 IO::AIO::flush;
2963 Coro::cede; 3488 Coro::cede_notself;
2964 last unless IO::AIO::nreqs || BDB::nreqs; 3489 last unless IO::AIO::nreqs || BDB::nreqs;
2965 warn "iterate..."; 3490 warn "iterate...";
2966 } 3491 }
2967 3492
2968 ++$RELOAD; 3493 ++$RELOAD;
3027 warn "reloading cf.pm"; 3552 warn "reloading cf.pm";
3028 require cf; 3553 require cf;
3029 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3030 3555
3031 warn "loading config and database again"; 3556 warn "loading config and database again";
3032 cf::cfg_load; 3557 cf::reload_config;
3033 3558
3034 warn "loading extensions"; 3559 warn "loading extensions";
3035 cf::load_extensions; 3560 cf::load_extensions;
3036 3561
3037 warn "reattaching attachments to objects/players"; 3562 warn "reattaching attachments to objects/players";
3044 warn "leaving sync_job"; 3569 warn "leaving sync_job";
3045 3570
3046 1 3571 1
3047 } or do { 3572 } or do {
3048 warn $@; 3573 warn $@;
3049 warn "error while reloading, exiting."; 3574 cf::cleanup "error while reloading, exiting.";
3050 exit 1;
3051 }; 3575 };
3052 3576
3053 warn "reloaded"; 3577 warn "reloaded";
3054}; 3578};
3055 3579
3057 3581
3058sub reload_perl() { 3582sub reload_perl() {
3059 # doing reload synchronously and two reloads happen back-to-back, 3583 # doing reload synchronously and two reloads happen back-to-back,
3060 # coro crashes during coro_state_free->destroy here. 3584 # coro crashes during coro_state_free->destroy here.
3061 3585
3062 $RELOAD_WATCHER ||= Event->timer ( 3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3063 reentrant => 0,
3064 after => 0,
3065 data => WF_AUTOCANCEL,
3066 cb => sub {
3067 do_reload_perl; 3587 do_reload_perl;
3068 undef $RELOAD_WATCHER; 3588 undef $RELOAD_WATCHER;
3069 },
3070 ); 3589 };
3071} 3590}
3072 3591
3073register_command "reload" => sub { 3592register_command "reload" => sub {
3074 my ($who, $arg) = @_; 3593 my ($who, $arg) = @_;
3075 3594
3076 if ($who->flag (FLAG_WIZ)) { 3595 if ($who->flag (FLAG_WIZ)) {
3077 $who->message ("reloading server."); 3596 $who->message ("reloading server.");
3597 async {
3598 $Coro::current->{desc} = "perl_reload";
3078 async { reload_perl }; 3599 reload_perl;
3600 };
3079 } 3601 }
3080}; 3602};
3081 3603
3082unshift @INC, $LIBDIR; 3604unshift @INC, $LIBDIR;
3083 3605
3085 3607
3086our @WAIT_FOR_TICK; 3608our @WAIT_FOR_TICK;
3087our @WAIT_FOR_TICK_BEGIN; 3609our @WAIT_FOR_TICK_BEGIN;
3088 3610
3089sub wait_for_tick { 3611sub wait_for_tick {
3090 return unless $TICK_WATCHER->is_active; 3612 return if tick_inhibit;
3091 return if $Coro::current == $Coro::main; 3613 return if $Coro::current == $Coro::main;
3092 3614
3093 my $signal = new Coro::Signal; 3615 my $signal = new Coro::Signal;
3094 push @WAIT_FOR_TICK, $signal; 3616 push @WAIT_FOR_TICK, $signal;
3095 $signal->wait; 3617 $signal->wait;
3096} 3618}
3097 3619
3098sub wait_for_tick_begin { 3620sub wait_for_tick_begin {
3099 return unless $TICK_WATCHER->is_active; 3621 return if tick_inhibit;
3100 return if $Coro::current == $Coro::main; 3622 return if $Coro::current == $Coro::main;
3101 3623
3102 my $signal = new Coro::Signal; 3624 my $signal = new Coro::Signal;
3103 push @WAIT_FOR_TICK_BEGIN, $signal; 3625 push @WAIT_FOR_TICK_BEGIN, $signal;
3104 $signal->wait; 3626 $signal->wait;
3105} 3627}
3106 3628
3107 my $min = 1e6;#d# 3629sub tick {
3108 my $avg = 10;
3109$TICK_WATCHER = Event->timer (
3110 reentrant => 0,
3111 parked => 1,
3112 prio => 0,
3113 at => $NEXT_TICK || $TICK,
3114 data => WF_AUTOCANCEL,
3115 cb => sub {
3116 if ($Coro::current != $Coro::main) { 3630 if ($Coro::current != $Coro::main) {
3117 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3631 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3118 unless ++$bug_warning > 10; 3632 unless ++$bug_warning > 10;
3119 return; 3633 return;
3120 } 3634 }
3121 3635
3122 $NOW = $tick_start = Event::time;
3123
3124 cf::server_tick; # one server iteration 3636 cf::server_tick; # one server iteration
3125 3637
3126 0 && sync_job {#d# 3638 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3127 for(1..10) { 3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3128 my $t = Event::time; 3640 Coro::async_pool {
3129 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3641 $Coro::current->{desc} = "runtime saver";
3130 or die; 3642 write_runtime
3131 3643 or warn "ERROR: unable to write runtime file: $!";
3132 $map->width (50);
3133 $map->height (50);
3134 $map->alloc;
3135 $map->_load_objects ("/tmp/x.map", 1);
3136 my $t = Event::time - $t;
3137
3138 #next unless $t < 0.0013;#d#
3139 if ($t < $min) {
3140 $min = $t;
3141 }
3142 $avg = $avg * 0.99 + $t * 0.01;
3143 }
3144 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3145 exit 0;
3146 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3147 }; 3644 };
3645 }
3148 3646
3149 $RUNTIME += $TICK;
3150 $NEXT_TICK += $TICK;
3151
3152 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3153 $NEXT_RUNTIME_WRITE = $NOW + 10;
3154 Coro::async_pool {
3155 write_runtime
3156 or warn "ERROR: unable to write runtime file: $!";
3157 };
3158 }
3159
3160# my $AFTER = Event::time;
3161# warn $AFTER - $NOW;#d#
3162
3163 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3164 $sig->send; 3648 $sig->send;
3165 } 3649 }
3166 while (my $sig = shift @WAIT_FOR_TICK) { 3650 while (my $sig = shift @WAIT_FOR_TICK) {
3167 $sig->send; 3651 $sig->send;
3168 } 3652 }
3169 3653
3170 $NOW = Event::time; 3654 $LOAD = ($NOW - $TICK_START) / $TICK;
3171
3172 # if we are delayed by four ticks or more, skip them all
3173 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3174
3175 $TICK_WATCHER->at ($NEXT_TICK);
3176 $TICK_WATCHER->start;
3177
3178 $LOAD = ($NOW - $tick_start) / $TICK;
3179 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3180 3656
3181 _post_tick; 3657 if (0) {
3182 3658 if ($NEXT_TICK) {
3183 3659 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d#
3662 }
3184 }, 3663 }
3185); 3664}
3186 3665
3187{ 3666{
3188 BDB::max_poll_time $TICK * 0.1; 3667 # configure BDB
3189 $BDB_POLL_WATCHER = Event->io ( 3668
3190 reentrant => 0,
3191 fd => BDB::poll_fileno,
3192 poll => 'r',
3193 prio => 0,
3194 data => WF_AUTOCANCEL,
3195 cb => \&BDB::poll_cb,
3196 );
3197 BDB::min_parallel 8; 3669 BDB::min_parallel 8;
3198 3670 BDB::max_poll_reqs $TICK * 0.1;
3199 BDB::set_sync_prepare { 3671 $Coro::BDB::WATCHER->priority (1);
3200 my $status;
3201 my $current = $Coro::current;
3202 (
3203 sub {
3204 $status = $!;
3205 $current->ready; undef $current;
3206 },
3207 sub {
3208 Coro::schedule while defined $current;
3209 $! = $status;
3210 },
3211 )
3212 };
3213 3672
3214 unless ($DB_ENV) { 3673 unless ($DB_ENV) {
3215 $DB_ENV = BDB::db_env_create; 3674 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3676 | BDB::LOG_AUTOREMOVE, 1);
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3216 3679
3217 cf::sync_job { 3680 cf::sync_job {
3218 eval { 3681 eval {
3219 BDB::db_env_open 3682 BDB::db_env_open
3220 $DB_ENV, 3683 $DB_ENV,
3222 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3685 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3223 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3686 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3224 0666; 3687 0666;
3225 3688
3226 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3689 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3227
3228 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3229 $DB_ENV->set_lk_detect;
3230 }; 3690 };
3231 3691
3232 cf::cleanup "db_env_open(db): $@" if $@; 3692 cf::cleanup "db_env_open(db): $@" if $@;
3233 }; 3693 };
3234 } 3694 }
3695
3696 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3697 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3698 };
3699 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3700 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3701 };
3702 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3703 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3704 };
3235} 3705}
3236 3706
3237{ 3707{
3708 # configure IO::AIO
3709
3238 IO::AIO::min_parallel 8; 3710 IO::AIO::min_parallel 8;
3239
3240 undef $Coro::AIO::WATCHER;
3241 IO::AIO::max_poll_time $TICK * 0.1; 3711 IO::AIO::max_poll_time $TICK * 0.1;
3242 $AIO_POLL_WATCHER = Event->io ( 3712 $Coro::AIO::WATCHER->priority (1);
3243 reentrant => 0,
3244 data => WF_AUTOCANCEL,
3245 fd => IO::AIO::poll_fileno,
3246 poll => 'r',
3247 prio => 6,
3248 cb => \&IO::AIO::poll_cb,
3249 );
3250} 3713}
3251 3714
3252my $_log_backtrace; 3715my $_log_backtrace;
3253 3716
3254sub _log_backtrace { 3717sub _log_backtrace {
3258 3721
3259 # limit the # of concurrent backtraces 3722 # limit the # of concurrent backtraces
3260 if ($_log_backtrace < 2) { 3723 if ($_log_backtrace < 2) {
3261 ++$_log_backtrace; 3724 ++$_log_backtrace;
3262 async { 3725 async {
3726 $Coro::current->{desc} = "abt $msg";
3727
3263 my @bt = fork_call { 3728 my @bt = fork_call {
3264 @addr = map { sprintf "%x", $_ } @addr; 3729 @addr = map { sprintf "%x", $_ } @addr;
3265 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3730 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3266 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3731 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3267 or die "addr2line: $!"; 3732 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines