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.307 by root, Sun Jul 15 22:39:48 2007 UTC vs.
Revision 1.418 by root, Fri Apr 11 21:09:53 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;
34use Digest::MD5 (); 57use Digest::MD5 ();
35 58
36# configure various modules to our taste 59# configure various modules to our taste
37# 60#
38$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
39Coro::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
40Compress::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
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 64
47$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
48 66
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 68
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
74 93
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 97our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
82 99
83our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 104our $DB_ENV;
85 105
86our %CFG; 106our %CFG;
87 107
88our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 109our $RUNTIME;
110our $NOW;
90 111
91our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
94 115
95# 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 ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 118
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
101 123
102binmode STDOUT; 124binmode STDOUT;
103binmode STDERR; 125binmode STDERR;
104 126
105# read virtual server time, if available 127# read virtual server time, if available
158 180
159The raw value load value from the last tick. 181The raw value load value from the last tick.
160 182
161=item %cf::CFG 183=item %cf::CFG
162 184
163Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 186from wherever your confdir points to.
165 187
166=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
167 189
168These 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
169returns 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
170per 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.
171 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
172=back 200=back
173 201
174=cut 202=cut
175 203
176BEGIN { 204BEGIN {
180 $msg .= "\n" 208 $msg .= "\n"
181 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
182 210
183 $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;
184 212
185 utf8::encode $msg;
186 LOG llevError, $msg; 213 LOG llevError, $msg;
187 }; 214 };
188} 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#?
189 231
190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
191@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
192@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
193@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206)) { 248)) {
207 no strict 'refs'; 249 no strict 'refs';
208 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
209} 251}
210 252
211$Event::DIED = sub { 253$EV::DIED = sub {
212 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
213}; 255};
214 256
215############################################################################# 257#############################################################################
216 258
239 $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;
240 $d 282 $d
241 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
242} 284}
243 285
244=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
245 287
246Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
247 289
248=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
249 291
250Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
251 293
252=cut 294=cut
253 295
254our $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
255 297
256sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
258 300
259=item cf::lock_wait $string 301=item cf::lock_wait $string
260 302
261Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
262 304
265Wait 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
266a 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,
267for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
268returned. 310returned.
269 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
270Lock 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
271uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
272 317
273=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
274 319
275Return 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.
276 321
277=cut 322=cut
278 323
279our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
280 326
281sub lock_wait($) { 327sub lock_wait($) {
282 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#
283 334
284 # wait for lock, if any 335 # wait for lock, if any
285 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule; 338 Coro::schedule;
293 344
294 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
295 lock_wait $key; 346 lock_wait $key;
296 347
297 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
298 350
299 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
300 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
302 } 355 }
303} 356}
304 357
307 360
308 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
309} 362}
310 363
311sub freeze_mainloop { 364sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
313 366
314 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
315 $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 }
316 }; 428 }
317 $TICK_WATCHER->stop; 429};
318 $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;
319} 441}
320 442
321=item cf::async { BLOCK } 443=item cf::async { BLOCK }
322 444
323Currently the same as Coro::async_pool, meaning you cannot use 445Currently the same as Coro::async_pool, meaning you cannot use
328 450
329BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
330 452
331=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
332 454
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 456is always able to handle events or runnable, as Deliantra is only
335partly 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
336acceptable. 458acceptable.
337 459
338If 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
339the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
344 466
345sub sync_job(&) { 467sub sync_job(&) {
346 my ($job) = @_; 468 my ($job) = @_;
347 469
348 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
349 my $time = Event::time; 471 my $time = EV::time;
350 472
351 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
353 475
354 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 477
356 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
357 479
358 my $busy = 1; 480 my $busy = 1;
359 my @res; 481 my @res;
360 482
361 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 485 @res = eval { $job->() };
363 warn $@ if $@; 486 warn $@ if $@;
364 undef $busy; 487 undef $busy;
365 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
366 489
367 while ($busy) { 490 while ($busy) {
368 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
369 } 495 }
496 }
370 497
371 $time = Event::time - $time; 498 my $time = EV::time - $time;
372 499
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
377 501
378 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
379 } else { 503 } else {
380 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
381 505
406=item fork_call { }, $args 530=item fork_call { }, $args
407 531
408Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
412 536
413=cut 537=cut
414
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423 538
424sub fork_call(&@) { 539sub fork_call(&@) {
425 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
426 541
427# 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,
428# or die "socketpair: $!"; 543 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 544 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 545
432 if (my $pid = fork) { 546 my @res = Coro::Util::fork_eval {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals; 547 reset_signals;
446 local $SIG{__WARN__}; 548 &$cb
447 local $SIG{__DIE__}; 549 }, @args;
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453 550
454 eval { 551 wantarray ? @res : $res[-1]
455 close $fh1; 552}
456 553
457 my @res = eval { $cb->(@args) }; 554=item $coin = coin_from_name $name
458 555
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 556=cut
460 close $fh2;
461 };
462 557
463 warn $@ if $@; 558our %coin_alias = (
464 _exit 0; 559 "silver" => "silvercoin",
465 } 560 "silvercoin" => "silvercoin",
561 "silvercoins" => "silvercoin",
562 "gold" => "goldcoin",
563 "goldcoin" => "goldcoin",
564 "goldcoins" => "goldcoin",
565 "platinum" => "platinacoin",
566 "platinumcoin" => "platinacoin",
567 "platinumcoins" => "platinacoin",
568 "platina" => "platinacoin",
569 "platinacoin" => "platinacoin",
570 "platinacoins" => "platinacoin",
571 "royalty" => "royalty",
572 "royalties" => "royalty",
573);
574
575sub coin_from_name($) {
576 $coin_alias{$_[0]}
577 ? cf::arch::find $coin_alias{$_[0]}
578 : undef
466} 579}
467 580
468=item $value = cf::db_get $family => $key 581=item $value = cf::db_get $family => $key
469 582
470Returns a single value from the environment database. 583Returns a single value from the environment database.
472=item cf::db_put $family => $key => $value 585=item cf::db_put $family => $key => $value
473 586
474Stores the given C<$value> in the family. It can currently store binary 587Stores the given C<$value> in the family. It can currently store binary
475data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 588data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
476 589
590=item $db = cf::db_table "name"
591
592Create and/or open a new database table. The string must not be "db" and must be unique
593within each server.
594
477=cut 595=cut
596
597sub db_table($) {
598 my ($name) = @_;
599 my $db = BDB::db_create $DB_ENV;
600
601 eval {
602 $db->set_flags (BDB::CHKSUM);
603
604 utf8::encode $name;
605 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
606 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
607 cf::cleanup "db_open(db): $!" if $!;
608 };
609 cf::cleanup "db_open(db): $@" if $@;
610
611 $db
612}
478 613
479our $DB; 614our $DB;
480 615
481sub db_init { 616sub db_init {
482 unless ($DB) {
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job { 617 cf::sync_job {
486 eval { 618 $DB ||= db_table "db";
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 } 619 };
496} 620}
497 621
498sub db_get($$) { 622sub db_get($$) {
499 my $key = "$_[0]/$_[1]"; 623 my $key = "$_[0]/$_[1]";
500 624
550 if (1) { 674 if (1) {
551 $md5 = 675 $md5 =
552 join "\x00", 676 join "\x00",
553 $processversion, 677 $processversion,
554 map { 678 map {
555 Coro::cede; 679 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 680 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 681 } 0.. $#$src;
558 682
559 683
560 my $dbmd5 = db_get cache => "$id/md5"; 684 my $dbmd5 = db_get cache => "$id/md5";
604attach callbacks/event handlers (a collection of which is called an "attachment") 728attach callbacks/event handlers (a collection of which is called an "attachment")
605to it. All such attachable objects support the following methods. 729to it. All such attachable objects support the following methods.
606 730
607In the following description, CLASS can be any of C<global>, C<object> 731In the following description, CLASS can be any of C<global>, C<object>
608C<player>, C<client> or C<map> (i.e. the attachable objects in 732C<player>, C<client> or C<map> (i.e. the attachable objects in
609Crossfire TRT). 733Deliantra).
610 734
611=over 4 735=over 4
612 736
613=item $attachable->attach ($attachment, key => $value...) 737=item $attachable->attach ($attachment, key => $value...)
614 738
866 "; 990 ";
867 die if $@; 991 die if $@;
868} 992}
869 993
870our $override; 994our $override;
871our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 995our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872 996
873sub override { 997sub override {
874 $override = 1; 998 $override = 1;
875 @invoke_results = (); 999 @INVOKE_RESULTS = (@_);
876} 1000}
877 1001
878sub do_invoke { 1002sub do_invoke {
879 my $event = shift; 1003 my $event = shift;
880 my $callbacks = shift; 1004 my $callbacks = shift;
881 1005
882 @invoke_results = (); 1006 @INVOKE_RESULTS = ();
883 1007
884 local $override; 1008 local $override;
885 1009
886 for (@$callbacks) { 1010 for (@$callbacks) {
887 eval { &{$_->[1]} }; 1011 eval { &{$_->[1]} };
896 } 1020 }
897 1021
898 0 1022 0
899} 1023}
900 1024
901=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1025=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
902 1026
903=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
904 1028
905Generate an object-specific event with the given arguments. 1029Generate an object-specific event with the given arguments.
906 1030
907This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1031This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908removed in future versions), and there is no public API to access override 1032removed in future versions), and there is no public API to access override
909results (if you must, access C<@cf::invoke_results> directly). 1033results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 1034
911=back 1035=back
912 1036
913=cut 1037=cut
914 1038
915############################################################################# 1039#############################################################################
916# object support 1040# object support
1041
1042sub _object_equal($$);
1043sub _object_equal($$) {
1044 my ($a, $b) = @_;
1045
1046 return 0 unless (ref $a) eq (ref $b);
1047
1048 if ("HASH" eq ref $a) {
1049 my @ka = keys %$a;
1050 my @kb = keys %$b;
1051
1052 return 0 if @ka != @kb;
1053
1054 for (0 .. $#ka) {
1055 return 0 unless $ka[$_] eq $kb[$_];
1056 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1057 }
1058
1059 } elsif ("ARRAY" eq ref $a) {
1060
1061 return 0 if @$a != @$b;
1062
1063 for (0 .. $#$a) {
1064 return 0 unless _object_equal $a->[$_], $b->[$_];
1065 }
1066
1067 } elsif ($a ne $b) {
1068 return 0;
1069 }
1070
1071 1
1072}
1073
1074our $SLOW_MERGES;#d#
1075sub _can_merge {
1076 my ($ob1, $ob2) = @_;
1077
1078 ++$SLOW_MERGES;#d#
1079
1080 # we do the slow way here
1081 return _object_equal $ob1, $ob2
1082}
917 1083
918sub reattach { 1084sub reattach {
919 # basically do the same as instantiate, without calling instantiate 1085 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 1086 my ($obj) = @_;
921 1087
942cf::attachable->attach ( 1108cf::attachable->attach (
943 prio => -1000000, 1109 prio => -1000000,
944 on_instantiate => sub { 1110 on_instantiate => sub {
945 my ($obj, $data) = @_; 1111 my ($obj, $data) = @_;
946 1112
947 $data = from_json $data; 1113 $data = decode_json $data;
948 1114
949 for (@$data) { 1115 for (@$data) {
950 my ($name, $args) = @$_; 1116 my ($name, $args) = @$_;
951 1117
952 $obj->attach ($name, %{$args || {} }); 1118 $obj->attach ($name, %{$args || {} });
968sub object_freezer_save { 1134sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1135 my ($filename, $rdata, $objs) = @_;
970 1136
971 sync_job { 1137 sync_job {
972 if (length $$rdata) { 1138 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename);
973 warn sprintf "saving %s (%d,%d)\n", 1140 warn sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1141 $decname, length $$rdata, scalar @$objs;
975 1142
976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977 chmod SAVE_MODE, $fh; 1144 chmod SAVE_MODE, $fh;
978 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979 aio_fsync $fh if $cf::USE_FSYNC; 1146 aio_fsync $fh if $cf::USE_FSYNC;
980 close $fh; 1147 close $fh;
981 1148
982 if (@$objs) { 1149 if (@$objs) {
983 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
984 chmod SAVE_MODE, $fh; 1151 chmod SAVE_MODE, $fh;
985 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986 aio_write $fh, 0, (length $data), $data, 0; 1153 aio_write $fh, 0, (length $data), $data, 0;
987 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
988 close $fh; 1155 close $fh;
989 aio_rename "$filename.pst~", "$filename.pst"; 1156 aio_rename "$filename.pst~", "$filename.pst";
990 } 1157 }
998 } 1165 }
999 } else { 1166 } else {
1000 aio_unlink $filename; 1167 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
1002 } 1169 }
1003 } 1170 };
1004} 1171}
1005 1172
1006sub object_freezer_as_string { 1173sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1174 my ($rdata, $objs) = @_;
1008 1175
1020 or return; 1187 or return;
1021 1188
1022 unless (aio_stat "$filename.pst") { 1189 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1190 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1191 or return;
1192
1025 $av = eval { (Storable::thaw $av)->{objs} }; 1193 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs};
1026 } 1195 }
1027 1196
1197 utf8::decode (my $decname = $filename);
1028 warn sprintf "loading %s (%d)\n", 1198 warn sprintf "loading %s (%d,%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1199 $decname, length $data, scalar @{$av || []};
1200
1030 return ($data, $av); 1201 ($data, $av)
1031} 1202}
1032 1203
1033=head2 COMMAND CALLBACKS 1204=head2 COMMAND CALLBACKS
1034 1205
1035=over 4 1206=over 4
1108 my ($pl, $buf) = @_; 1279 my ($pl, $buf) = @_;
1109 1280
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1281 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1282
1112 if (ref $msg) { 1283 if (ref $msg) {
1284 my ($type, $reply, @payload) =
1285 "ARRAY" eq ref $msg
1286 ? @$msg
1287 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1288
1289 my @reply;
1290
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1291 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1292 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1293 }
1294
1295 $pl->ext_reply ($reply, @reply)
1296 if $reply;
1297
1118 } else { 1298 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1299 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1300 }
1121 1301
1122 cf::override; 1302 cf::override;
1175 my $msg = $@ ? "$v->{path}: $@\n" 1355 my $msg = $@ ? "$v->{path}: $@\n"
1176 : "$v->{base}: extension inactive.\n"; 1356 : "$v->{base}: extension inactive.\n";
1177 1357
1178 if (exists $v->{meta}{mandatory}) { 1358 if (exists $v->{meta}{mandatory}) {
1179 warn $msg; 1359 warn $msg;
1180 warn "mandatory extension failed to load, exiting.\n"; 1360 cf::cleanup "mandatory extension failed to load, exiting.";
1181 exit 1;
1182 } 1361 }
1183 1362
1184 warn $msg; 1363 warn $msg;
1185 } 1364 }
1186 1365
1211use Coro::AIO; 1390use Coro::AIO;
1212 1391
1213=head3 cf::player 1392=head3 cf::player
1214 1393
1215=over 4 1394=over 4
1395
1396=item cf::player::num_playing
1397
1398Returns the official number of playing players, as per the Crossfire metaserver rules.
1399
1400=cut
1401
1402sub num_playing {
1403 scalar grep
1404 $_->ob->map
1405 && !$_->hidden
1406 && !$_->ob->flag (cf::FLAG_WIZ),
1407 cf::player::list
1408}
1216 1409
1217=item cf::player::find $login 1410=item cf::player::find $login
1218 1411
1219Returns the given player object, loading it if necessary (might block). 1412Returns the given player object, loading it if necessary (might block).
1220 1413
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1449 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1450 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1451 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1452 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1453
1261 my $pl = load_pl path $login 1454 my $f = new_from_file cf::object::thawer path $login
1262 or return; 1455 or return;
1456
1457 my $pl = cf::player::load_pl $f
1458 or return;
1459 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs;
1263 $cf::PLAYER{$login} = $pl 1461 $cf::PLAYER{$login} = $pl
1264 } 1462 }
1265 } 1463 }
1266} 1464}
1267 1465
1277 1475
1278 aio_mkdir playerdir $pl, 0770; 1476 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1477 $pl->{last_save} = $cf::RUNTIME;
1280 1478
1281 $pl->save_pl ($path); 1479 $pl->save_pl ($path);
1282 Coro::cede; 1480 cf::cede_to_tick;
1283} 1481}
1284 1482
1285sub new($) { 1483sub new($) {
1286 my ($login) = @_; 1484 my ($login) = @_;
1287 1485
1291 $self->{deny_save} = 1; 1489 $self->{deny_save} = 1;
1292 1490
1293 $cf::PLAYER{$login} = $self; 1491 $cf::PLAYER{$login} = $self;
1294 1492
1295 $self 1493 $self
1494}
1495
1496=item $player->send_msg ($channel, $msg, $color, [extra...])
1497
1498=cut
1499
1500sub send_msg {
1501 my $ns = shift->ns
1502 or return;
1503 $ns->send_msg (@_);
1296} 1504}
1297 1505
1298=item $pl->quit_character 1506=item $pl->quit_character
1299 1507
1300Nukes the player without looking back. If logged in, the connection will 1508Nukes the player without looking back. If logged in, the connection will
1355 or return []; 1563 or return [];
1356 1564
1357 my @logins; 1565 my @logins;
1358 1566
1359 for my $login (@$dirs) { 1567 for my $login (@$dirs) {
1568 my $path = path $login;
1569
1570 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1573 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1574 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 }
1363 1576
1364 utf8::decode $login; 1577 utf8::decode $login;
1365 push @logins, $login; 1578 push @logins, $login;
1366 } 1579 }
1367 1580
1400 1613
1401Expand crossfire pod fragments into protocol xml. 1614Expand crossfire pod fragments into protocol xml.
1402 1615
1403=cut 1616=cut
1404 1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1405sub expand_cfpod { 1629sub expand_cfpod {
1406 ((my $self), (local $_)) = @_; 1630 my ($self, $pod) = @_;
1407 1631
1408 # escape & and < 1632 my $xml;
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411 1633
1412 # this is buggy, it needs to properly take care of nested <'s 1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1413 1637
1414 1 while 1638 $group =~ s/&/&amp;/g;
1415 # replace B<>, I<>, U<> etc. 1639 $group =~ s/</&lt;/g;
1416 s/B<([^\>]*)>/<b>$1<\/b>/ 1640
1417 || s/I<([^\>]*)>/<i>$1<\/i>/ 1641 $xml .= $group;
1418 || s/U<([^\>]*)>/<u>$1<\/u>/ 1642 } elsif ($pod =~ m%\G
1419 # replace G<male|female> tags 1643 ([BCGHITU])
1420 || s{G<([^>|]*)\|([^>]*)>}{ 1644 <
1421 $self->gender ? $2 : $1 1645 (?:
1422 }ge 1646 ([^<>]*) (?{ $group = $^N })
1423 # replace H<hint text> 1647 | < $interior >
1424 || s{H<([^\>]*)>} 1648 )
1649 >
1650 %gcsx
1425 { 1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "") 1671 "")
1429 [$self->{hintmode}] 1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1430 }ge; 1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1431 1683
1684 for ($xml) {
1432 # create single paragraphs (very hackish) 1685 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g; 1686 s/(?<=\S)\n(?=\w)/ /g;
1434 1687
1435 # compress some whitespace 1688 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends 1689 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines 1690 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines 1691 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines 1692 s/\n+$//; # ending lines
1693 }
1440 1694
1441 $_ 1695 $xml
1442} 1696}
1697
1698no re 'eval';
1443 1699
1444sub hintmode { 1700sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1702 $_[0]{hintmode}
1447} 1703}
1448 1704
1449=item $player->ext_reply ($msgid, %msg) 1705=item $player->ext_reply ($msgid, @msg)
1450 1706
1451Sends an ext reply to the player. 1707Sends an ext reply to the player.
1452 1708
1453=cut 1709=cut
1454 1710
1455sub ext_reply($$%) { 1711sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1712 my ($self, $id, @msg) = @_;
1457 1713
1458 $msg{msgid} = $id; 1714 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1715}
1461 1716
1462=item $player->ext_event ($type, %msg) 1717=item $player->ext_msg ($type, @msg)
1463 1718
1464Sends an ext event to the client. 1719Sends an ext event to the client.
1465 1720
1466=cut 1721=cut
1467 1722
1468sub ext_event($$%) { 1723sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1724 my ($self, $type, @msg) = @_;
1470 1725
1471 $self->ns->ext_event ($type, %msg); 1726 $self->ns->ext_msg ($type, @msg);
1472} 1727}
1473 1728
1474=head3 cf::region 1729=head3 cf::region
1475 1730
1476=over 4 1731=over 4
1520our $MAX_RESET = 3600; 1775our $MAX_RESET = 3600;
1521our $DEFAULT_RESET = 3000; 1776our $DEFAULT_RESET = 3000;
1522 1777
1523sub generate_random_map { 1778sub generate_random_map {
1524 my ($self, $rmp) = @_; 1779 my ($self, $rmp) = @_;
1780
1781 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1782
1525 # mit "rum" bekleckern, nicht 1783 # mit "rum" bekleckern, nicht
1526 $self->_create_random_map ( 1784 $self->_create_random_map (
1527 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1785 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1528 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1786 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1529 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1787 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1619 $self->init; # pass $1 etc. 1877 $self->init; # pass $1 etc.
1620 return $self; 1878 return $self;
1621 } 1879 }
1622 } 1880 }
1623 1881
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1882 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1883 ()
1626} 1884}
1627 1885
1628sub init { 1886sub init {
1629 my ($self) = @_; 1887 my ($self) = @_;
1692 1950
1693sub load_header_from($) { 1951sub load_header_from($) {
1694 my ($self, $path) = @_; 1952 my ($self, $path) = @_;
1695 1953
1696 utf8::encode $path; 1954 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1955 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 or return; 1956 or return;
1957
1958 $self->_load_header ($f)
1959 or return;
1960
1961 local $MAP_LOADING{$self->{path}} = $self;
1962 $f->resolve_delayed_derefs;
1702 1963
1703 $self->{load_path} = $path; 1964 $self->{load_path} = $path;
1704 1965
1705 1 1966 1
1706} 1967}
1760sub find { 2021sub find {
1761 my ($path, $origin) = @_; 2022 my ($path, $origin) = @_;
1762 2023
1763 $path = normalise $path, $origin && $origin->path; 2024 $path = normalise $path, $origin && $origin->path;
1764 2025
2026 cf::lock_wait "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 2027 cf::lock_wait "map_find:$path";
1766 2028
1767 $cf::MAP{$path} || do { 2029 $cf::MAP{$path} || do {
1768 my $guard = cf::lock_acquire "map_find:$path"; 2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2032
1769 my $map = new_from_path cf::map $path 2033 my $map = new_from_path cf::map $path
1770 or return; 2034 or return;
1771 2035
1772 $map->{last_save} = $cf::RUNTIME; 2036 $map->{last_save} = $cf::RUNTIME;
1773 2037
1775 or return; 2039 or return;
1776 2040
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 2042 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 2043 #$cf::WAIT_FOR_TICK->wait;
2044 undef $guard1;
2045 undef $guard2;
1780 $map->reset; 2046 $map->reset;
1781 undef $guard;
1782 return find $path; 2047 return find $path;
1783 } 2048 }
1784 2049
1785 $cf::MAP{$path} = $map 2050 $cf::MAP{$path} = $map
1786 } 2051 }
1795 local $self->{deny_reset} = 1; # loading can take a long time 2060 local $self->{deny_reset} = 1; # loading can take a long time
1796 2061
1797 my $path = $self->{path}; 2062 my $path = $self->{path};
1798 2063
1799 { 2064 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2065 my $guard = cf::lock_acquire "map_data:$path";
1801 2066
2067 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2068 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2069
1804 $self->in_memory (cf::MAP_LOADING); 2070 $self->in_memory (cf::MAP_LOADING);
1805 2071
1806 $self->alloc; 2072 $self->alloc;
1807 2073
1808 $self->pre_load; 2074 $self->pre_load;
1809 Coro::cede; 2075 cf::cede_to_tick;
1810 2076
2077 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2079 $self->_load_objects ($f)
1812 or return; 2080 or return;
1813 2081
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815 if delete $self->{load_original}; 2083 if delete $self->{load_original};
1816 2084
1817 if (my $uniq = $self->uniq_path) { 2085 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2086 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2087 unless (aio_stat $uniq) {
2088 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2089 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2090 $self->_load_objects ($f);
2091 $f->resolve_delayed_derefs;
2092 }
1822 } 2093 }
1823 } 2094 }
1824 2095
1825 Coro::cede; 2096 $f->resolve_delayed_derefs;
2097
2098 cf::cede_to_tick;
1826 # now do the right thing for maps 2099 # now do the right thing for maps
1827 $self->link_multipart_objects; 2100 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2101 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2102 unless $self->difficulty;
1830 Coro::cede; 2103 cf::cede_to_tick;
1831 2104
1832 unless ($self->{deny_activate}) { 2105 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2106 $self->decay_objects;
1834 $self->fix_auto_apply; 2107 $self->fix_auto_apply;
1835 $self->update_buttons; 2108 $self->update_buttons;
1836 Coro::cede; 2109 cf::cede_to_tick;
1837 $self->set_darkness_map; 2110 $self->set_darkness_map;
1838 Coro::cede; 2111 cf::cede_to_tick;
1839 $self->activate; 2112 $self->activate;
1840 } 2113 }
2114
2115 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME);
1841 2117
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2118 $self->in_memory (cf::MAP_IN_MEMORY);
1843 } 2119 }
1844 2120
1845 $self->post_load; 2121 $self->post_load;
1856 2132
1857 $self 2133 $self
1858} 2134}
1859 2135
1860# find and load all maps in the 3x3 area around a map 2136# find and load all maps in the 3x3 area around a map
1861sub load_diag { 2137sub load_neighbours {
1862 my ($map) = @_; 2138 my ($map) = @_;
1863 2139
1864 my @diag; # diagonal neighbours 2140 my @neigh; # diagonal neighbours
1865 2141
1866 for (0 .. 3) { 2142 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2143 my $neigh = $map->tile_path ($_)
1868 or next; 2144 or next;
1869 $neigh = find $neigh, $map 2145 $neigh = find $neigh, $map
1870 or next; 2146 or next;
1871 $neigh->load; 2147 $neigh->load;
1872 2148
2149 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2150 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2151 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2152 }
1876 2153
1877 for (@diag) { 2154 for (grep defined $_->[0], @neigh) {
2155 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2156 my $neigh = find $path, $origin
1879 or next; 2157 or next;
1880 $neigh->load; 2158 $neigh->load;
1881 } 2159 }
1882} 2160}
1883 2161
1888} 2166}
1889 2167
1890sub do_load_sync { 2168sub do_load_sync {
1891 my ($map) = @_; 2169 my ($map) = @_;
1892 2170
2171 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2172 if $Coro::current == $Coro::main;
2173
1893 cf::sync_job { $map->load }; 2174 cf::sync_job { $map->load };
1894} 2175}
1895 2176
1896our %MAP_PREFETCH; 2177our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2178our $MAP_PREFETCHER = undef;
1898 2179
1899sub find_async { 2180sub find_async {
1900 my ($path, $origin) = @_; 2181 my ($path, $origin, $load) = @_;
1901 2182
1902 $path = normalise $path, $origin && $origin->{path}; 2183 $path = normalise $path, $origin && $origin->{path};
1903 2184
1904 if (my $map = $cf::MAP{$path}) { 2185 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1906 } 2187 }
1907 2188
1908 undef $MAP_PREFETCH{$path}; 2189 $MAP_PREFETCH{$path} |= $load;
2190
1909 $MAP_PREFETCHER ||= cf::async { 2191 $MAP_PREFETCHER ||= cf::async {
2192 $Coro::current->{desc} = "map prefetcher";
2193
1910 while (%MAP_PREFETCH) { 2194 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2195 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 2196 if (my $map = find $k) {
1913 or next;
1914 $map->load; 2197 $map->load if $v;
2198 }
1915 2199
1916 delete $MAP_PREFETCH{$path}; 2200 delete $MAP_PREFETCH{$k};
1917 } 2201 }
1918 } 2202 }
1919 undef $MAP_PREFETCHER; 2203 undef $MAP_PREFETCHER;
1920 }; 2204 };
1921 $MAP_PREFETCHER->prio (6); 2205 $MAP_PREFETCHER->prio (6);
1924} 2208}
1925 2209
1926sub save { 2210sub save {
1927 my ($self) = @_; 2211 my ($self) = @_;
1928 2212
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2214
1931 $self->{last_save} = $cf::RUNTIME; 2215 $self->{last_save} = $cf::RUNTIME;
1932 2216
1933 return unless $self->dirty; 2217 return unless $self->dirty;
1934 2218
1940 return if $self->{deny_save}; 2224 return if $self->{deny_save};
1941 2225
1942 local $self->{last_access} = $self->last_access;#d# 2226 local $self->{last_access} = $self->last_access;#d#
1943 2227
1944 cf::async { 2228 cf::async {
2229 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2230 $_->contr->save for $self->players;
1946 }; 2231 };
1947 2232
1948 if ($uniq) { 2233 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1957 my ($self) = @_; 2242 my ($self) = @_;
1958 2243
1959 # save first because save cedes 2244 # save first because save cedes
1960 $self->save; 2245 $self->save;
1961 2246
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2247 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2248
1964 return if $self->players; 2249 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2250 return if $self->in_memory != cf::MAP_IN_MEMORY;
1966 return if $self->{deny_save}; 2251 return if $self->{deny_save};
1967 2252
2253 $self->in_memory (cf::MAP_SWAPPED);
2254
2255 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2257 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2258}
1971 2259
1972sub reset_at { 2260sub reset_at {
1973 my ($self) = @_; 2261 my ($self) = @_;
1974 2262
2006 if $uniq; 2294 if $uniq;
2007 } 2295 }
2008 2296
2009 delete $cf::MAP{$self->path}; 2297 delete $cf::MAP{$self->path};
2010 2298
2299 $self->deactivate;
2300 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2301 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2302
2015 $self->unlink_save; 2303 $self->unlink_save;
2016 $self->destroy; 2304 $self->destroy;
2017} 2305}
2018 2306
2019my $nuke_counter = "aaaa"; 2307my $nuke_counter = "aaaa";
2020 2308
2021sub nuke { 2309sub nuke {
2022 my ($self) = @_; 2310 my ($self) = @_;
2023 2311
2312 {
2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2314
2024 delete $cf::MAP{$self->path}; 2315 delete $cf::MAP{$self->path};
2025 2316
2026 $self->unlink_save; 2317 $self->unlink_save;
2027 2318
2028 bless $self, "cf::map"; 2319 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2320 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2321 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2322 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2323 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2324
2034 $cf::MAP{$self->path} = $self; 2325 $cf::MAP{$self->path} = $self;
2326 }
2035 2327
2036 $self->reset; # polite request, might not happen 2328 $self->reset; # polite request, might not happen
2037} 2329}
2038 2330
2039=item $maps = cf::map::tmp_maps 2331=item $maps = cf::map::tmp_maps
2088 : () 2380 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] } 2381 } @{ aio_readdir $UNIQUEDIR or [] }
2090 ] 2382 ]
2091} 2383}
2092 2384
2093package cf;
2094
2095=back 2385=back
2096 2386
2097=head3 cf::object 2387=head3 cf::object
2098 2388
2099=cut 2389=cut
2113 map { $_, inv_recursive_ $_->inv } @_ 2403 map { $_, inv_recursive_ $_->inv } @_
2114} 2404}
2115 2405
2116sub inv_recursive { 2406sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2407 inv_recursive_ inv $_[0]
2408}
2409
2410=item $ref = $ob->ref
2411
2412creates and returns a persistent reference to an objetc that can be stored as a string.
2413
2414=item $ob = cf::object::deref ($refstring)
2415
2416returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2417even if the object actually exists. May block.
2418
2419=cut
2420
2421sub deref {
2422 my ($ref) = @_;
2423
2424 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2425 my ($uuid, $name) = ($1, $2);
2426 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2427 or return;
2428 $pl->ob->uuid eq $uuid
2429 or return;
2430
2431 $pl->ob
2432 } else {
2433 warn "$ref: cannot resolve object reference\n";
2434 undef
2435 }
2118} 2436}
2119 2437
2120package cf; 2438package cf;
2121 2439
2122=back 2440=back
2146 2464
2147 } else { 2465 } else {
2148 my $pl = $self->contr; 2466 my $pl = $self->contr;
2149 2467
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2468 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2469 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2470 $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 2471
2159 } else { 2472 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2473 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2474 $self->message ($msg, $flags);
2162 } 2475 }
2163 } 2476 }
2477}
2478
2479=item $object->send_msg ($channel, $msg, $color, [extra...])
2480
2481=cut
2482
2483sub cf::object::send_msg {
2484 my $pl = shift->contr
2485 or return;
2486 $pl->send_msg (@_);
2164} 2487}
2165 2488
2166=item $player_object->may ("access") 2489=item $player_object->may ("access")
2167 2490
2168Returns wether the given player is authorized to access resource "access" 2491Returns wether the given player is authorized to access resource "access"
2247 # use -1 or undef as default coordinates, not 0, 0 2570 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2571 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2572 if $x <=0 && $y <= 0;
2250 2573
2251 $map->load; 2574 $map->load;
2252 $map->load_diag; 2575 $map->load_neighbours;
2253 2576
2254 return unless $self->contr->active; 2577 return unless $self->contr->active;
2255 $self->activate_recursive; 2578 $self->activate_recursive;
2256 2579
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2580 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2277 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2600 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2278 2601
2279 $self->enter_link; 2602 $self->enter_link;
2280 2603
2281 (async { 2604 (async {
2605 $Coro::current->{desc} = "player::goto $path $x $y";
2606
2607 # *tag paths override both path and x|y
2608 if ($path =~ /^\*(.*)$/) {
2609 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2610 my $ob = $obs[rand @obs];
2611
2612 # see if we actually can go there
2613 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2614 $ob = $obs[rand @obs];
2615 } else {
2616 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2617 }
2618 # else put us there anyways for now #d#
2619
2620 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2621 } else {
2622 ($path, $x, $y) = (undef, undef, undef);
2623 }
2624 }
2625
2282 my $map = eval { 2626 my $map = eval {
2283 my $map = cf::map::find $path; 2627 my $map = defined $path ? cf::map::find $path : undef;
2284 2628
2285 if ($map) { 2629 if ($map) {
2286 $map = $map->customise_for ($self); 2630 $map = $map->customise_for ($self);
2287 $map = $check->($map) if $check && $map; 2631 $map = $check->($map) if $check && $map;
2288 } else { 2632 } else {
2289 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2633 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2290 } 2634 }
2291 2635
2292 $map 2636 $map
2293 }; 2637 };
2294 2638
2347 $rmp->{origin_y} = $exit->y; 2691 $rmp->{origin_y} = $exit->y;
2348 } 2692 }
2349 2693
2350 $rmp->{random_seed} ||= $exit->random_seed; 2694 $rmp->{random_seed} ||= $exit->random_seed;
2351 2695
2352 my $data = cf::to_json $rmp; 2696 my $data = cf::encode_json $rmp;
2353 my $md5 = Digest::MD5::md5_hex $data; 2697 my $md5 = Digest::MD5::md5_hex $data;
2354 my $meta = "$RANDOMDIR/$md5.meta"; 2698 my $meta = "$RANDOMDIR/$md5.meta";
2355 2699
2356 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2700 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2357 aio_write $fh, 0, (length $data), $data, 0; 2701 aio_write $fh, 0, (length $data), $data, 0;
2384 # if exit is damned, update players death & WoR home-position 2728 # if exit is damned, update players death & WoR home-position
2385 $self->contr->savebed ($slaying, $hp, $sp) 2729 $self->contr->savebed ($slaying, $hp, $sp)
2386 if $exit->flag (FLAG_DAMNED); 2730 if $exit->flag (FLAG_DAMNED);
2387 2731
2388 (async { 2732 (async {
2733 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2734
2389 $self->deactivate_recursive; # just to be sure 2735 $self->deactivate_recursive; # just to be sure
2390 unless (eval { 2736 unless (eval {
2391 $self->goto ($slaying, $hp, $sp); 2737 $self->goto ($slaying, $hp, $sp);
2392 2738
2393 1; 2739 1;
2419 2765
2420 utf8::encode $text; 2766 utf8::encode $text;
2421 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2767 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2422} 2768}
2423 2769
2424=item $client->send_msg ($color, $type, $msg, [extra...]) 2770=item $client->send_msg ($channel, $msg, $color, [extra...])
2425 2771
2426Send a drawinfo or msg packet to the client, formatting the msg for the 2772Send a drawinfo or msg packet to the client, formatting the msg for the
2427client if neccessary. C<$type> should be a string identifying the type of 2773client if neccessary. C<$type> should be a string identifying the type of
2428the message, with C<log> being the default. If C<$color> is negative, suppress 2774the message, with C<log> being the default. If C<$color> is negative, suppress
2429the message unless the client supports the msg packet. 2775the message unless the client supports the msg packet.
2430 2776
2431=cut 2777=cut
2432 2778
2779# non-persistent channels (usually the info channel)
2780our %CHANNEL = (
2781 "c/identify" => {
2782 id => "infobox",
2783 title => "Identify",
2784 reply => undef,
2785 tooltip => "Items recently identified",
2786 },
2787 "c/examine" => {
2788 id => "infobox",
2789 title => "Examine",
2790 reply => undef,
2791 tooltip => "Signs and other items you examined",
2792 },
2793 "c/book" => {
2794 id => "infobox",
2795 title => "Book",
2796 reply => undef,
2797 tooltip => "The contents of a note or book",
2798 },
2799 "c/lookat" => {
2800 id => "infobox",
2801 title => "Look",
2802 reply => undef,
2803 tooltip => "What you saw there",
2804 },
2805 "c/who" => {
2806 id => "infobox",
2807 title => "Players",
2808 reply => undef,
2809 tooltip => "Shows players who are currently online",
2810 },
2811 "c/body" => {
2812 id => "infobox",
2813 title => "Body Parts",
2814 reply => undef,
2815 tooltip => "Shows which body parts you posess and are available",
2816 },
2817 "c/uptime" => {
2818 id => "infobox",
2819 title => "Uptime",
2820 reply => undef,
2821 tooltip => "How long the server has been running since last restart",
2822 },
2823 "c/mapinfo" => {
2824 id => "infobox",
2825 title => "Map Info",
2826 reply => undef,
2827 tooltip => "Information related to the maps",
2828 },
2829);
2830
2433sub cf::client::send_msg { 2831sub cf::client::send_msg {
2434 my ($self, $color, $type, $msg, @extra) = @_; 2832 my ($self, $channel, $msg, $color, @extra) = @_;
2435 2833
2436 $msg = $self->pl->expand_cfpod ($msg); 2834 $msg = $self->pl->expand_cfpod ($msg);
2437 2835
2836 $color &= cf::NDI_CLIENT_MASK; # just in case...
2837
2838 # check predefined channels, for the benefit of C
2839 if ($CHANNEL{$channel}) {
2840 $channel = $CHANNEL{$channel};
2841
2842 $self->ext_msg (channel_info => $channel)
2843 if $self->can_msg;
2844
2845 $channel = $channel->{id};
2846
2847 } elsif (ref $channel) {
2848 # send meta info to client, if not yet sent
2849 unless (exists $self->{channel}{$channel->{id}}) {
2850 $self->{channel}{$channel->{id}} = $channel;
2851 $self->ext_msg (channel_info => $channel)
2852 if $self->can_msg;
2853 }
2854
2855 $channel = $channel->{id};
2856 }
2857
2438 return unless @extra || length $msg; 2858 return unless @extra || length $msg;
2439 2859
2440 if ($self->can_msg) { 2860 if ($self->can_msg) {
2861 # default colour, mask it out
2862 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2863 if $color & cf::NDI_DEF;
2864
2441 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2865 $self->send_packet ("msg " . $self->{json_coder}->encode (
2866 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2442 } else { 2867 } else {
2443 # replace some tags by gcfclient-compatible ones
2444 for ($msg) {
2445 1 while
2446 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451 }
2452
2453 if ($color >= 0) { 2868 if ($color >= 0) {
2869 # replace some tags by gcfclient-compatible ones
2870 for ($msg) {
2871 1 while
2872 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2873 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2874 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2875 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2876 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2877 }
2878
2879 $color &= cf::NDI_COLOR_MASK;
2880
2881 utf8::encode $msg;
2882
2454 if (0 && $msg =~ /\[/) { 2883 if (0 && $msg =~ /\[/) {
2884 # COMMAND/INFO
2455 $self->send_packet ("drawextinfo $color 4 0 $msg") 2885 $self->send_packet ("drawextinfo $color 10 8 $msg")
2456 } else { 2886 } else {
2457 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2887 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2458 $self->send_packet ("drawinfo $color $msg") 2888 $self->send_packet ("drawinfo $color $msg")
2459 } 2889 }
2460 } 2890 }
2461 } 2891 }
2462} 2892}
2463 2893
2464=item $client->ext_event ($type, %msg) 2894=item $client->ext_msg ($type, @msg)
2465 2895
2466Sends an ext event to the client. 2896Sends an ext event to the client.
2467 2897
2468=cut 2898=cut
2469 2899
2470sub cf::client::ext_event($$%) { 2900sub cf::client::ext_msg($$@) {
2471 my ($self, $type, %msg) = @_; 2901 my ($self, $type, @msg) = @_;
2472 2902
2473 return unless $self->extcmd; 2903 if ($self->extcmd == 2) {
2474 2904 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2905 } elsif ($self->extcmd == 1) { # TODO: remove
2475 $msg{msgtype} = "event_$type"; 2906 push @msg, msgtype => "event_$type";
2476 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2907 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2908 }
2909}
2910
2911=item $client->ext_reply ($msgid, @msg)
2912
2913Sends an ext reply to the client.
2914
2915=cut
2916
2917sub cf::client::ext_reply($$@) {
2918 my ($self, $id, @msg) = @_;
2919
2920 if ($self->extcmd == 2) {
2921 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2922 } elsif ($self->extcmd == 1) {
2923 #TODO: version 1, remove
2924 unshift @msg, msgtype => "reply", msgid => $id;
2925 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2926 }
2477} 2927}
2478 2928
2479=item $success = $client->query ($flags, "text", \&cb) 2929=item $success = $client->query ($flags, "text", \&cb)
2480 2930
2481Queues a query to the client, calling the given callback with 2931Queues a query to the client, calling the given callback with
2536 my ($ns, $buf) = @_; 2986 my ($ns, $buf) = @_;
2537 2987
2538 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2988 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539 2989
2540 if (ref $msg) { 2990 if (ref $msg) {
2991 my ($type, $reply, @payload) =
2992 "ARRAY" eq ref $msg
2993 ? @$msg
2994 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2995
2996 my @reply;
2997
2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2998 if (my $cb = $EXTICMD{$type}) {
2542 if (my %reply = $cb->($ns, $msg)) { 2999 @reply = $cb->($ns, @payload);
2543 $reply{msgid} = $msg->{msgid};
2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545 }
2546 } 3000 }
3001
3002 $ns->ext_reply ($reply, @reply)
3003 if $reply;
3004
2547 } else { 3005 } else {
2548 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3006 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2549 } 3007 }
2550 3008
2551 cf::override; 3009 cf::override;
2598our $safe = new Safe "safe"; 3056our $safe = new Safe "safe";
2599our $safe_hole = new Safe::Hole; 3057our $safe_hole = new Safe::Hole;
2600 3058
2601$SIG{FPE} = 'IGNORE'; 3059$SIG{FPE} = 'IGNORE';
2602 3060
2603$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3061$safe->permit_only (Opcode::opset qw(
3062 :base_core :base_mem :base_orig :base_math
3063 grepstart grepwhile mapstart mapwhile
3064 sort time
3065));
2604 3066
2605# here we export the classes and methods available to script code 3067# here we export the classes and methods available to script code
2606 3068
2607=pod 3069=pod
2608 3070
2609The following functions and methods are available within a safe environment: 3071The following functions and methods are available within a safe environment:
2610 3072
2611 cf::object 3073 cf::object
2612 contr pay_amount pay_player map x y force_find force_add 3074 contr pay_amount pay_player map x y force_find force_add destroy
2613 insert remove 3075 insert remove name archname title slaying race decrease_ob_nr
2614 3076
2615 cf::object::player 3077 cf::object::player
2616 player 3078 player
2617 3079
2618 cf::player 3080 cf::player
2623 3085
2624=cut 3086=cut
2625 3087
2626for ( 3088for (
2627 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3089 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3090 insert remove inv name archname title slaying race
2628 insert remove)], 3091 decrease_ob_nr destroy)],
2629 ["cf::object::player" => qw(player)], 3092 ["cf::object::player" => qw(player)],
2630 ["cf::player" => qw(peaceful)], 3093 ["cf::player" => qw(peaceful)],
2631 ["cf::map" => qw(trigger)], 3094 ["cf::map" => qw(trigger)],
2632) { 3095) {
2633 no strict 'refs'; 3096 no strict 'refs';
2709# the server's init and main functions 3172# the server's init and main functions
2710 3173
2711sub load_facedata($) { 3174sub load_facedata($) {
2712 my ($path) = @_; 3175 my ($path) = @_;
2713 3176
3177 # HACK to clear player env face cache, we need some signal framework
3178 # for this (global event?)
3179 %ext::player_env::MUSIC_FACE_CACHE = ();
3180
3181 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3182
2714 warn "loading facedata from $path\n"; 3183 warn "loading facedata from $path\n";
2715 3184
2716 my $facedata; 3185 my $facedata;
2717 0 < aio_load $path, $facedata 3186 0 < aio_load $path, $facedata
2718 or die "$path: $!"; 3187 or die "$path: $!";
2720 $facedata = Coro::Storable::thaw $facedata; 3189 $facedata = Coro::Storable::thaw $facedata;
2721 3190
2722 $facedata->{version} == 2 3191 $facedata->{version} == 2
2723 or cf::cleanup "$path: version mismatch, cannot proceed."; 3192 or cf::cleanup "$path: version mismatch, cannot proceed.";
2724 3193
3194 # patch in the exptable
3195 $facedata->{resource}{"res/exp_table"} = {
3196 type => FT_RSRC,
3197 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3198 };
3199 cf::cede_to_tick;
3200
2725 { 3201 {
2726 my $faces = $facedata->{faceinfo}; 3202 my $faces = $facedata->{faceinfo};
2727 3203
2728 while (my ($face, $info) = each %$faces) { 3204 while (my ($face, $info) = each %$faces) {
2729 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3205 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206
2730 cf::face::set_visibility $idx, $info->{visibility}; 3207 cf::face::set_visibility $idx, $info->{visibility};
2731 cf::face::set_magicmap $idx, $info->{magicmap}; 3208 cf::face::set_magicmap $idx, $info->{magicmap};
2732 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2733 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2734 3211
2735 cf::cede_to_tick; 3212 cf::cede_to_tick;
2736 } 3213 }
2737 3214
2738 while (my ($face, $info) = each %$faces) { 3215 while (my ($face, $info) = each %$faces) {
2739 next unless $info->{smooth}; 3216 next unless $info->{smooth};
3217
2740 my $idx = cf::face::find $face 3218 my $idx = cf::face::find $face
2741 or next; 3219 or next;
3220
2742 if (my $smooth = cf::face::find $info->{smooth}) { 3221 if (my $smooth = cf::face::find $info->{smooth}) {
2743 cf::face::set_smooth $idx, $smooth; 3222 cf::face::set_smooth $idx, $smooth;
2744 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3223 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2745 } else { 3224 } else {
2746 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3225 warn "smooth face '$info->{smooth}' not found for face '$face'";
2763 3242
2764 { 3243 {
2765 # TODO: for gcfclient pleasure, we should give resources 3244 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index. 3245 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource}; 3246 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical;
2769 3247
2770 while (my ($name, $info) = each %$res) { 3248 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({ 3249 if (defined $info->{type}) {
2772 name => $name,
2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO#
2775 });
2776
2777 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3250 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3251 my $data;
2778 3252
2779 if ($name =~ /\.jpg$/) { 3253 if ($info->{type} & 1) {
2780 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3254 # prepend meta info
2781 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3255
3256 my $meta = $enc->encode ({
3257 name => $name,
3258 %{ $info->{meta} || {} },
3259 });
3260
3261 $data = pack "(w/a*)*", $meta, $info->{data};
3262 } else {
3263 $data = $info->{data};
3264 }
3265
3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type};
2782 } else { 3268 } else {
2783 my $data = pack "(w/a*)*", $meta, $info->{data}; 3269 $RESOURCE{$name} = $info;
2784 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2785
2786 cf::face::set_type $idx, 1;
2787 cf::face::set_data $idx, 0, $data, $chk;
2788 } 3270 }
2789 3271
2790 cf::cede_to_tick; 3272 cf::cede_to_tick;
2791 } 3273 }
2792 } 3274 }
2793 3275
3276 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3277
2794 1 3278 1
2795} 3279}
2796 3280
3281cf::global->attach (on_resource_update => sub {
3282 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3283 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3284
3285 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3286 my $sound = $soundconf->{compat}[$_]
3287 or next;
3288
3289 my $face = cf::face::find "sound/$sound->[1]";
3290 cf::sound::set $sound->[0] => $face;
3291 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3292 }
3293
3294 while (my ($k, $v) = each %{$soundconf->{event}}) {
3295 my $face = cf::face::find "sound/$v";
3296 cf::sound::set $k => $face;
3297 }
3298 }
3299});
3300
3301register_exticmd fx_want => sub {
3302 my ($ns, $want) = @_;
3303
3304 while (my ($k, $v) = each %$want) {
3305 $ns->fx_want ($k, $v);
3306 }
3307};
3308
2797sub reload_regions { 3309sub reload_regions {
3310 # HACK to clear player env face cache, we need some signal framework
3311 # for this (global event?)
3312 %ext::player_env::MUSIC_FACE_CACHE = ();
3313
2798 load_resource_file "$MAPDIR/regions" 3314 load_resource_file "$MAPDIR/regions"
2799 or die "unable to load regions file\n"; 3315 or die "unable to load regions file\n";
2800 3316
2801 for (cf::region::list) { 3317 for (cf::region::list) {
2802 $_->{match} = qr/$_->{match}/ 3318 $_->{match} = qr/$_->{match}/
2838 3354
2839sub init { 3355sub init {
2840 reload_resources; 3356 reload_resources;
2841} 3357}
2842 3358
2843sub cfg_load { 3359sub reload_config {
2844 open my $fh, "<:utf8", "$CONFDIR/config" 3360 open my $fh, "<:utf8", "$CONFDIR/config"
2845 or return; 3361 or return;
2846 3362
2847 local $/; 3363 local $/;
2848 *CFG = YAML::Syck::Load <$fh>; 3364 *CFG = YAML::Load <$fh>;
2849 3365
2850 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2851 3367
2852 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2853 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3369 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2864sub main { 3380sub main {
2865 # we must not ever block the main coroutine 3381 # we must not ever block the main coroutine
2866 local $Coro::idle = sub { 3382 local $Coro::idle = sub {
2867 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3383 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2868 (async { 3384 (async {
2869 Event::one_event; 3385 $Coro::current->{desc} = "IDLE BUG HANDLER";
3386 EV::loop EV::LOOP_ONESHOT;
2870 })->prio (Coro::PRIO_MAX); 3387 })->prio (Coro::PRIO_MAX);
2871 }; 3388 };
2872 3389
2873 cfg_load; 3390 reload_config;
2874 db_init; 3391 db_init;
2875 load_extensions; 3392 load_extensions;
2876 3393
2877 $TICK_WATCHER->start; 3394 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 evthread_start IO::AIO::poll_fileno;
2878 Event::loop; 3396 EV::loop;
2879} 3397}
2880 3398
2881############################################################################# 3399#############################################################################
2882# initialisation and cleanup 3400# initialisation and cleanup
2883 3401
2884# install some emergency cleanup handlers 3402# install some emergency cleanup handlers
2885BEGIN { 3403BEGIN {
3404 our %SIGWATCHER = ();
2886 for my $signal (qw(INT HUP TERM)) { 3405 for my $signal (qw(INT HUP TERM)) {
2887 Event->signal ( 3406 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2888 reentrant => 0,
2889 data => WF_AUTOCANCEL,
2890 signal => $signal,
2891 prio => 0,
2892 cb => sub {
2893 cf::cleanup "SIG$signal"; 3407 cf::cleanup "SIG$signal";
2894 },
2895 ); 3408 };
2896 } 3409 }
2897} 3410}
2898 3411
2899sub write_runtime { 3412sub write_runtime_sync {
2900 my $runtime = "$LOCALDIR/runtime"; 3413 my $runtime = "$LOCALDIR/runtime";
2901 3414
2902 # first touch the runtime file to show we are still running: 3415 # first touch the runtime file to show we are still running:
2903 # the fsync below can take a very very long time. 3416 # the fsync below can take a very very long time.
2904 3417
2930 and return; 3443 and return;
2931 3444
2932 warn "runtime file written.\n"; 3445 warn "runtime file written.\n";
2933 3446
2934 1 3447 1
3448}
3449
3450our $uuid_lock;
3451our $uuid_skip;
3452
3453sub write_uuid_sync($) {
3454 $uuid_skip ||= $_[0];
3455
3456 return if $uuid_lock;
3457 local $uuid_lock = 1;
3458
3459 my $uuid = "$LOCALDIR/uuid";
3460
3461 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3462 or return;
3463
3464 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3465 $uuid_skip = 0;
3466
3467 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3468 and return;
3469
3470 # always fsync - this file is important
3471 aio_fsync $fh
3472 and return;
3473
3474 close $fh
3475 or return;
3476
3477 aio_rename "$uuid~", $uuid
3478 and return;
3479
3480 warn "uuid file written ($value).\n";
3481
3482 1
3483
3484}
3485
3486sub write_uuid($$) {
3487 my ($skip, $sync) = @_;
3488
3489 $sync ? write_uuid_sync $skip
3490 : async { write_uuid_sync $skip };
2935} 3491}
2936 3492
2937sub emergency_save() { 3493sub emergency_save() {
2938 my $freeze_guard = cf::freeze_mainloop; 3494 my $freeze_guard = cf::freeze_mainloop;
2939 3495
2945 # and maps saved/destroyed asynchronously. 3501 # and maps saved/destroyed asynchronously.
2946 warn "begin emergency player save\n"; 3502 warn "begin emergency player save\n";
2947 for my $login (keys %cf::PLAYER) { 3503 for my $login (keys %cf::PLAYER) {
2948 my $pl = $cf::PLAYER{$login} or next; 3504 my $pl = $cf::PLAYER{$login} or next;
2949 $pl->valid or next; 3505 $pl->valid or next;
3506 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2950 $pl->save; 3507 $pl->save;
2951 } 3508 }
2952 warn "end emergency player save\n"; 3509 warn "end emergency player save\n";
2953 3510
2954 warn "begin emergency map save\n"; 3511 warn "begin emergency map save\n";
2960 warn "end emergency map save\n"; 3517 warn "end emergency map save\n";
2961 3518
2962 warn "begin emergency database checkpoint\n"; 3519 warn "begin emergency database checkpoint\n";
2963 BDB::db_env_txn_checkpoint $DB_ENV; 3520 BDB::db_env_txn_checkpoint $DB_ENV;
2964 warn "end emergency database checkpoint\n"; 3521 warn "end emergency database checkpoint\n";
3522
3523 warn "begin write uuid\n";
3524 write_uuid_sync 1;
3525 warn "end write uuid\n";
2965 }; 3526 };
2966 3527
2967 warn "leave emergency perl save\n"; 3528 warn "leave emergency perl save\n";
2968} 3529}
2969 3530
2984 warn "reloading..."; 3545 warn "reloading...";
2985 3546
2986 warn "entering sync_job"; 3547 warn "entering sync_job";
2987 3548
2988 cf::sync_job { 3549 cf::sync_job {
2989 cf::write_runtime; # external watchdog should not bark 3550 cf::write_runtime_sync; # external watchdog should not bark
2990 cf::emergency_save; 3551 cf::emergency_save;
2991 cf::write_runtime; # external watchdog should not bark 3552 cf::write_runtime_sync; # external watchdog should not bark
2992 3553
2993 warn "syncing database to disk"; 3554 warn "syncing database to disk";
2994 BDB::db_env_txn_checkpoint $DB_ENV; 3555 BDB::db_env_txn_checkpoint $DB_ENV;
2995 3556
2996 # if anything goes wrong in here, we should simply crash as we already saved 3557 # if anything goes wrong in here, we should simply crash as we already saved
2997
2998 warn "cancelling all WF_AUTOCANCEL watchers";
2999 for (Event::all_watchers) {
3000 $_->cancel if $_->data & WF_AUTOCANCEL;
3001 }
3002 3558
3003 warn "flushing outstanding aio requests"; 3559 warn "flushing outstanding aio requests";
3004 for (;;) { 3560 for (;;) {
3005 BDB::flush; 3561 BDB::flush;
3006 IO::AIO::flush; 3562 IO::AIO::flush;
3007 Coro::cede; 3563 Coro::cede_notself;
3008 last unless IO::AIO::nreqs || BDB::nreqs; 3564 last unless IO::AIO::nreqs || BDB::nreqs;
3009 warn "iterate..."; 3565 warn "iterate...";
3010 } 3566 }
3011 3567
3012 ++$RELOAD; 3568 ++$RELOAD;
3071 warn "reloading cf.pm"; 3627 warn "reloading cf.pm";
3072 require cf; 3628 require cf;
3073 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3629 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3074 3630
3075 warn "loading config and database again"; 3631 warn "loading config and database again";
3076 cf::cfg_load; 3632 cf::reload_config;
3077 3633
3078 warn "loading extensions"; 3634 warn "loading extensions";
3079 cf::load_extensions; 3635 cf::load_extensions;
3080 3636
3081 warn "reattaching attachments to objects/players"; 3637 warn "reattaching attachments to objects/players";
3088 warn "leaving sync_job"; 3644 warn "leaving sync_job";
3089 3645
3090 1 3646 1
3091 } or do { 3647 } or do {
3092 warn $@; 3648 warn $@;
3093 warn "error while reloading, exiting."; 3649 cf::cleanup "error while reloading, exiting.";
3094 exit 1;
3095 }; 3650 };
3096 3651
3097 warn "reloaded"; 3652 warn "reloaded";
3098}; 3653};
3099 3654
3101 3656
3102sub reload_perl() { 3657sub reload_perl() {
3103 # doing reload synchronously and two reloads happen back-to-back, 3658 # doing reload synchronously and two reloads happen back-to-back,
3104 # coro crashes during coro_state_free->destroy here. 3659 # coro crashes during coro_state_free->destroy here.
3105 3660
3106 $RELOAD_WATCHER ||= Event->timer ( 3661 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3107 reentrant => 0,
3108 after => 0,
3109 data => WF_AUTOCANCEL,
3110 cb => sub {
3111 do_reload_perl; 3662 do_reload_perl;
3112 undef $RELOAD_WATCHER; 3663 undef $RELOAD_WATCHER;
3113 },
3114 ); 3664 };
3115} 3665}
3116 3666
3117register_command "reload" => sub { 3667register_command "reload" => sub {
3118 my ($who, $arg) = @_; 3668 my ($who, $arg) = @_;
3119 3669
3120 if ($who->flag (FLAG_WIZ)) { 3670 if ($who->flag (FLAG_WIZ)) {
3121 $who->message ("reloading server."); 3671 $who->message ("reloading server.");
3672 async {
3673 $Coro::current->{desc} = "perl_reload";
3122 async { reload_perl }; 3674 reload_perl;
3675 };
3123 } 3676 }
3124}; 3677};
3125 3678
3126unshift @INC, $LIBDIR; 3679unshift @INC, $LIBDIR;
3127 3680
3129 3682
3130our @WAIT_FOR_TICK; 3683our @WAIT_FOR_TICK;
3131our @WAIT_FOR_TICK_BEGIN; 3684our @WAIT_FOR_TICK_BEGIN;
3132 3685
3133sub wait_for_tick { 3686sub wait_for_tick {
3134 return unless $TICK_WATCHER->is_active; 3687 return if tick_inhibit;
3135 return if $Coro::current == $Coro::main; 3688 return if $Coro::current == $Coro::main;
3136 3689
3137 my $signal = new Coro::Signal; 3690 my $signal = new Coro::Signal;
3138 push @WAIT_FOR_TICK, $signal; 3691 push @WAIT_FOR_TICK, $signal;
3139 $signal->wait; 3692 $signal->wait;
3140} 3693}
3141 3694
3142sub wait_for_tick_begin { 3695sub wait_for_tick_begin {
3143 return unless $TICK_WATCHER->is_active; 3696 return if tick_inhibit;
3144 return if $Coro::current == $Coro::main; 3697 return if $Coro::current == $Coro::main;
3145 3698
3146 my $signal = new Coro::Signal; 3699 my $signal = new Coro::Signal;
3147 push @WAIT_FOR_TICK_BEGIN, $signal; 3700 push @WAIT_FOR_TICK_BEGIN, $signal;
3148 $signal->wait; 3701 $signal->wait;
3149} 3702}
3150 3703
3151 my $min = 1e6;#d# 3704sub tick {
3152 my $avg = 10;
3153$TICK_WATCHER = Event->timer (
3154 reentrant => 0,
3155 parked => 1,
3156 prio => 0,
3157 at => $NEXT_TICK || $TICK,
3158 data => WF_AUTOCANCEL,
3159 cb => sub {
3160 if ($Coro::current != $Coro::main) { 3705 if ($Coro::current != $Coro::main) {
3161 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3706 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3162 unless ++$bug_warning > 10; 3707 unless ++$bug_warning > 10;
3163 return; 3708 return;
3164 } 3709 }
3165 3710
3166 $NOW = $tick_start = Event::time;
3167
3168 cf::server_tick; # one server iteration 3711 cf::server_tick; # one server iteration
3169 3712
3170 0 && sync_job {#d# 3713 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3171 for(1..10) { 3714 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3172 my $t = Event::time; 3715 Coro::async_pool {
3173 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3716 $Coro::current->{desc} = "runtime saver";
3174 or die; 3717 write_runtime_sync
3175 3718 or warn "ERROR: unable to write runtime file: $!";
3176 $map->width (50);
3177 $map->height (50);
3178 $map->alloc;
3179 $map->_load_objects ("/tmp/x.map", 1);
3180 my $t = Event::time - $t;
3181
3182 #next unless $t < 0.0013;#d#
3183 if ($t < $min) {
3184 $min = $t;
3185 }
3186 $avg = $avg * 0.99 + $t * 0.01;
3187 }
3188 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3189 exit 0;
3190 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3191 }; 3719 };
3720 }
3192 3721
3193 $RUNTIME += $TICK;
3194 $NEXT_TICK += $TICK;
3195
3196 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3197 $NEXT_RUNTIME_WRITE = $NOW + 10;
3198 Coro::async_pool {
3199 write_runtime
3200 or warn "ERROR: unable to write runtime file: $!";
3201 };
3202 }
3203
3204# my $AFTER = Event::time;
3205# warn $AFTER - $NOW;#d#
3206
3207 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3722 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3208 $sig->send; 3723 $sig->send;
3209 } 3724 }
3210 while (my $sig = shift @WAIT_FOR_TICK) { 3725 while (my $sig = shift @WAIT_FOR_TICK) {
3211 $sig->send; 3726 $sig->send;
3212 } 3727 }
3213 3728
3214 $NOW = Event::time; 3729 $LOAD = ($NOW - $TICK_START) / $TICK;
3215
3216 # if we are delayed by four ticks or more, skip them all
3217 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3218
3219 $TICK_WATCHER->at ($NEXT_TICK);
3220 $TICK_WATCHER->start;
3221
3222 $LOAD = ($NOW - $tick_start) / $TICK;
3223 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3730 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3224 3731
3225 _post_tick; 3732 if (0) {
3226 3733 if ($NEXT_TICK) {
3227 3734 my $jitter = $TICK_START - $NEXT_TICK;
3735 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3736 warn "jitter $JITTER\n";#d#
3737 }
3228 }, 3738 }
3229); 3739}
3230 3740
3231{ 3741{
3232 BDB::max_poll_time $TICK * 0.1; 3742 # configure BDB
3233 $BDB_POLL_WATCHER = Event->io ( 3743
3234 reentrant => 0,
3235 fd => BDB::poll_fileno,
3236 poll => 'r',
3237 prio => 0,
3238 data => WF_AUTOCANCEL,
3239 cb => \&BDB::poll_cb,
3240 );
3241 BDB::min_parallel 8; 3744 BDB::min_parallel 8;
3242 3745 BDB::max_poll_reqs $TICK * 0.1;
3243 BDB::set_sync_prepare { 3746 $Coro::BDB::WATCHER->priority (1);
3244 my $status;
3245 my $current = $Coro::current;
3246 (
3247 sub {
3248 $status = $!;
3249 $current->ready; undef $current;
3250 },
3251 sub {
3252 Coro::schedule while defined $current;
3253 $! = $status;
3254 },
3255 )
3256 };
3257 3747
3258 unless ($DB_ENV) { 3748 unless ($DB_ENV) {
3259 $DB_ENV = BDB::db_env_create; 3749 $DB_ENV = BDB::db_env_create;
3750 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3751 | BDB::LOG_AUTOREMOVE, 1);
3752 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3753 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3260 3754
3261 cf::sync_job { 3755 cf::sync_job {
3262 eval { 3756 eval {
3263 BDB::db_env_open 3757 BDB::db_env_open
3264 $DB_ENV, 3758 $DB_ENV,
3266 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3760 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3267 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3761 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3268 0666; 3762 0666;
3269 3763
3270 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3764 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3271
3272 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3273 $DB_ENV->set_lk_detect;
3274 }; 3765 };
3275 3766
3276 cf::cleanup "db_env_open(db): $@" if $@; 3767 cf::cleanup "db_env_open(db): $@" if $@;
3277 }; 3768 };
3278 } 3769 }
3770
3771 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3772 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3773 };
3774 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3775 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3776 };
3777 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3778 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3779 };
3279} 3780}
3280 3781
3281{ 3782{
3783 # configure IO::AIO
3784
3282 IO::AIO::min_parallel 8; 3785 IO::AIO::min_parallel 8;
3283
3284 undef $Coro::AIO::WATCHER;
3285 IO::AIO::max_poll_time $TICK * 0.1; 3786 IO::AIO::max_poll_time $TICK * 0.1;
3286 $AIO_POLL_WATCHER = Event->io ( 3787 $Coro::AIO::WATCHER->priority (1);
3287 reentrant => 0,
3288 data => WF_AUTOCANCEL,
3289 fd => IO::AIO::poll_fileno,
3290 poll => 'r',
3291 prio => 6,
3292 cb => \&IO::AIO::poll_cb,
3293 );
3294} 3788}
3295 3789
3296my $_log_backtrace; 3790my $_log_backtrace;
3297 3791
3298sub _log_backtrace { 3792sub _log_backtrace {
3302 3796
3303 # limit the # of concurrent backtraces 3797 # limit the # of concurrent backtraces
3304 if ($_log_backtrace < 2) { 3798 if ($_log_backtrace < 2) {
3305 ++$_log_backtrace; 3799 ++$_log_backtrace;
3306 async { 3800 async {
3801 $Coro::current->{desc} = "abt $msg";
3802
3307 my @bt = fork_call { 3803 my @bt = fork_call {
3308 @addr = map { sprintf "%x", $_ } @addr; 3804 @addr = map { sprintf "%x", $_ } @addr;
3309 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3805 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3310 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3806 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3311 or die "addr2line: $!"; 3807 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines