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.306 by root, Sat Jul 14 14:33:30 2007 UTC vs.
Revision 1.416 by root, Fri Apr 11 13:59:06 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
1619 $self->init; # pass $1 etc. 1874 $self->init; # pass $1 etc.
1620 return $self; 1875 return $self;
1621 } 1876 }
1622 } 1877 }
1623 1878
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1879 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1880 ()
1626} 1881}
1627 1882
1628sub init { 1883sub init {
1629 my ($self) = @_; 1884 my ($self) = @_;
1692 1947
1693sub load_header_from($) { 1948sub load_header_from($) {
1694 my ($self, $path) = @_; 1949 my ($self, $path) = @_;
1695 1950
1696 utf8::encode $path; 1951 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1952 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 or return; 1953 or return;
1954
1955 $self->_load_header ($f)
1956 or return;
1957
1958 local $MAP_LOADING{$self->{path}} = $self;
1959 $f->resolve_delayed_derefs;
1702 1960
1703 $self->{load_path} = $path; 1961 $self->{load_path} = $path;
1704 1962
1705 1 1963 1
1706} 1964}
1760sub find { 2018sub find {
1761 my ($path, $origin) = @_; 2019 my ($path, $origin) = @_;
1762 2020
1763 $path = normalise $path, $origin && $origin->path; 2021 $path = normalise $path, $origin && $origin->path;
1764 2022
2023 cf::lock_wait "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 2024 cf::lock_wait "map_find:$path";
1766 2025
1767 $cf::MAP{$path} || do { 2026 $cf::MAP{$path} || do {
1768 my $guard = cf::lock_acquire "map_find:$path"; 2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2029
1769 my $map = new_from_path cf::map $path 2030 my $map = new_from_path cf::map $path
1770 or return; 2031 or return;
1771 2032
1772 $map->{last_save} = $cf::RUNTIME; 2033 $map->{last_save} = $cf::RUNTIME;
1773 2034
1775 or return; 2036 or return;
1776 2037
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 2039 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 2040 #$cf::WAIT_FOR_TICK->wait;
2041 undef $guard1;
2042 undef $guard2;
1780 $map->reset; 2043 $map->reset;
1781 undef $guard;
1782 return find $path; 2044 return find $path;
1783 } 2045 }
1784 2046
1785 $cf::MAP{$path} = $map 2047 $cf::MAP{$path} = $map
1786 } 2048 }
1795 local $self->{deny_reset} = 1; # loading can take a long time 2057 local $self->{deny_reset} = 1; # loading can take a long time
1796 2058
1797 my $path = $self->{path}; 2059 my $path = $self->{path};
1798 2060
1799 { 2061 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2062 my $guard = cf::lock_acquire "map_data:$path";
1801 2063
2064 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2065 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2066
1804 $self->in_memory (cf::MAP_LOADING); 2067 $self->in_memory (cf::MAP_LOADING);
1805 2068
1806 $self->alloc; 2069 $self->alloc;
1807 2070
1808 $self->pre_load; 2071 $self->pre_load;
1809 Coro::cede; 2072 cf::cede_to_tick;
1810 2073
2074 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2076 $self->_load_objects ($f)
1812 or return; 2077 or return;
1813 2078
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815 if delete $self->{load_original}; 2080 if delete $self->{load_original};
1816 2081
1817 if (my $uniq = $self->uniq_path) { 2082 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2083 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2084 unless (aio_stat $uniq) {
2085 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2086 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2087 $self->_load_objects ($f);
2088 $f->resolve_delayed_derefs;
2089 }
1822 } 2090 }
1823 } 2091 }
1824 2092
1825 Coro::cede; 2093 $f->resolve_delayed_derefs;
2094
2095 cf::cede_to_tick;
1826 # now do the right thing for maps 2096 # now do the right thing for maps
1827 $self->link_multipart_objects; 2097 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2098 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2099 unless $self->difficulty;
1830 Coro::cede; 2100 cf::cede_to_tick;
1831 2101
1832 unless ($self->{deny_activate}) { 2102 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2103 $self->decay_objects;
1834 $self->fix_auto_apply; 2104 $self->fix_auto_apply;
1835 $self->update_buttons; 2105 $self->update_buttons;
1836 Coro::cede; 2106 cf::cede_to_tick;
1837 $self->set_darkness_map; 2107 $self->set_darkness_map;
1838 Coro::cede; 2108 cf::cede_to_tick;
1839 $self->activate; 2109 $self->activate;
1840 } 2110 }
2111
2112 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME);
1841 2114
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2115 $self->in_memory (cf::MAP_IN_MEMORY);
1843 } 2116 }
1844 2117
1845 $self->post_load; 2118 $self->post_load;
1856 2129
1857 $self 2130 $self
1858} 2131}
1859 2132
1860# find and load all maps in the 3x3 area around a map 2133# find and load all maps in the 3x3 area around a map
1861sub load_diag { 2134sub load_neighbours {
1862 my ($map) = @_; 2135 my ($map) = @_;
1863 2136
1864 my @diag; # diagonal neighbours 2137 my @neigh; # diagonal neighbours
1865 2138
1866 for (0 .. 3) { 2139 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2140 my $neigh = $map->tile_path ($_)
1868 or next; 2141 or next;
1869 $neigh = find $neigh, $map 2142 $neigh = find $neigh, $map
1870 or next; 2143 or next;
1871 $neigh->load; 2144 $neigh->load;
1872 2145
2146 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2147 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2148 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2149 }
1876 2150
1877 for (@diag) { 2151 for (grep defined $_->[0], @neigh) {
2152 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2153 my $neigh = find $path, $origin
1879 or next; 2154 or next;
1880 $neigh->load; 2155 $neigh->load;
1881 } 2156 }
1882} 2157}
1883 2158
1888} 2163}
1889 2164
1890sub do_load_sync { 2165sub do_load_sync {
1891 my ($map) = @_; 2166 my ($map) = @_;
1892 2167
2168 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2169 if $Coro::current == $Coro::main;
2170
1893 cf::sync_job { $map->load }; 2171 cf::sync_job { $map->load };
1894} 2172}
1895 2173
1896our %MAP_PREFETCH; 2174our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2175our $MAP_PREFETCHER = undef;
1898 2176
1899sub find_async { 2177sub find_async {
1900 my ($path, $origin) = @_; 2178 my ($path, $origin, $load) = @_;
1901 2179
1902 $path = normalise $path, $origin && $origin->{path}; 2180 $path = normalise $path, $origin && $origin->{path};
1903 2181
1904 if (my $map = $cf::MAP{$path}) { 2182 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1906 } 2184 }
1907 2185
1908 undef $MAP_PREFETCH{$path}; 2186 $MAP_PREFETCH{$path} |= $load;
2187
1909 $MAP_PREFETCHER ||= cf::async { 2188 $MAP_PREFETCHER ||= cf::async {
2189 $Coro::current->{desc} = "map prefetcher";
2190
1910 while (%MAP_PREFETCH) { 2191 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2192 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 2193 if (my $map = find $k) {
1913 or next;
1914 $map->load; 2194 $map->load if $v;
2195 }
1915 2196
1916 delete $MAP_PREFETCH{$path}; 2197 delete $MAP_PREFETCH{$k};
1917 } 2198 }
1918 } 2199 }
1919 undef $MAP_PREFETCHER; 2200 undef $MAP_PREFETCHER;
1920 }; 2201 };
1921 $MAP_PREFETCHER->prio (6); 2202 $MAP_PREFETCHER->prio (6);
1924} 2205}
1925 2206
1926sub save { 2207sub save {
1927 my ($self) = @_; 2208 my ($self) = @_;
1928 2209
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2211
1931 $self->{last_save} = $cf::RUNTIME; 2212 $self->{last_save} = $cf::RUNTIME;
1932 2213
1933 return unless $self->dirty; 2214 return unless $self->dirty;
1934 2215
1940 return if $self->{deny_save}; 2221 return if $self->{deny_save};
1941 2222
1942 local $self->{last_access} = $self->last_access;#d# 2223 local $self->{last_access} = $self->last_access;#d#
1943 2224
1944 cf::async { 2225 cf::async {
2226 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2227 $_->contr->save for $self->players;
1946 }; 2228 };
1947 2229
1948 if ($uniq) { 2230 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1957 my ($self) = @_; 2239 my ($self) = @_;
1958 2240
1959 # save first because save cedes 2241 # save first because save cedes
1960 $self->save; 2242 $self->save;
1961 2243
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2244 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2245
1964 return if $self->players; 2246 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2247 return if $self->in_memory != cf::MAP_IN_MEMORY;
1966 return if $self->{deny_save}; 2248 return if $self->{deny_save};
1967 2249
2250 $self->in_memory (cf::MAP_SWAPPED);
2251
2252 $self->deactivate;
2253 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2254 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2255}
1971 2256
1972sub reset_at { 2257sub reset_at {
1973 my ($self) = @_; 2258 my ($self) = @_;
1974 2259
2006 if $uniq; 2291 if $uniq;
2007 } 2292 }
2008 2293
2009 delete $cf::MAP{$self->path}; 2294 delete $cf::MAP{$self->path};
2010 2295
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2298 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2299
2015 $self->unlink_save; 2300 $self->unlink_save;
2016 $self->destroy; 2301 $self->destroy;
2017} 2302}
2018 2303
2019my $nuke_counter = "aaaa"; 2304my $nuke_counter = "aaaa";
2020 2305
2021sub nuke { 2306sub nuke {
2022 my ($self) = @_; 2307 my ($self) = @_;
2023 2308
2309 {
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2024 delete $cf::MAP{$self->path}; 2312 delete $cf::MAP{$self->path};
2025 2313
2026 $self->unlink_save; 2314 $self->unlink_save;
2027 2315
2028 bless $self, "cf::map"; 2316 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2317 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2318 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2319 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2320 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2321
2034 $cf::MAP{$self->path} = $self; 2322 $cf::MAP{$self->path} = $self;
2323 }
2035 2324
2036 $self->reset; # polite request, might not happen 2325 $self->reset; # polite request, might not happen
2037} 2326}
2038 2327
2039=item $maps = cf::map::tmp_maps 2328=item $maps = cf::map::tmp_maps
2088 : () 2377 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] } 2378 } @{ aio_readdir $UNIQUEDIR or [] }
2090 ] 2379 ]
2091} 2380}
2092 2381
2093package cf;
2094
2095=back 2382=back
2096 2383
2097=head3 cf::object 2384=head3 cf::object
2098 2385
2099=cut 2386=cut
2113 map { $_, inv_recursive_ $_->inv } @_ 2400 map { $_, inv_recursive_ $_->inv } @_
2114} 2401}
2115 2402
2116sub inv_recursive { 2403sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2404 inv_recursive_ inv $_[0]
2405}
2406
2407=item $ref = $ob->ref
2408
2409creates and returns a persistent reference to an objetc that can be stored as a string.
2410
2411=item $ob = cf::object::deref ($refstring)
2412
2413returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2414even if the object actually exists. May block.
2415
2416=cut
2417
2418sub deref {
2419 my ($ref) = @_;
2420
2421 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2422 my ($uuid, $name) = ($1, $2);
2423 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2424 or return;
2425 $pl->ob->uuid eq $uuid
2426 or return;
2427
2428 $pl->ob
2429 } else {
2430 warn "$ref: cannot resolve object reference\n";
2431 undef
2432 }
2118} 2433}
2119 2434
2120package cf; 2435package cf;
2121 2436
2122=back 2437=back
2146 2461
2147 } else { 2462 } else {
2148 my $pl = $self->contr; 2463 my $pl = $self->contr;
2149 2464
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2465 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2466 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2467 $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 2468
2159 } else { 2469 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2470 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2471 $self->message ($msg, $flags);
2162 } 2472 }
2163 } 2473 }
2474}
2475
2476=item $object->send_msg ($channel, $msg, $color, [extra...])
2477
2478=cut
2479
2480sub cf::object::send_msg {
2481 my $pl = shift->contr
2482 or return;
2483 $pl->send_msg (@_);
2164} 2484}
2165 2485
2166=item $player_object->may ("access") 2486=item $player_object->may ("access")
2167 2487
2168Returns wether the given player is authorized to access resource "access" 2488Returns wether the given player is authorized to access resource "access"
2247 # use -1 or undef as default coordinates, not 0, 0 2567 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2568 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2569 if $x <=0 && $y <= 0;
2250 2570
2251 $map->load; 2571 $map->load;
2252 $map->load_diag; 2572 $map->load_neighbours;
2253 2573
2254 return unless $self->contr->active; 2574 return unless $self->contr->active;
2255 $self->activate_recursive; 2575 $self->activate_recursive;
2256 2576
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2277 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2597 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2278 2598
2279 $self->enter_link; 2599 $self->enter_link;
2280 2600
2281 (async { 2601 (async {
2602 $Coro::current->{desc} = "player::goto $path $x $y";
2603
2604 # *tag paths override both path and x|y
2605 if ($path =~ /^\*(.*)$/) {
2606 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2607 my $ob = $obs[rand @obs];
2608
2609 # see if we actually can go there
2610 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2611 $ob = $obs[rand @obs];
2612 } else {
2613 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2614 }
2615 # else put us there anyways for now #d#
2616
2617 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2618 } else {
2619 ($path, $x, $y) = (undef, undef, undef);
2620 }
2621 }
2622
2282 my $map = eval { 2623 my $map = eval {
2283 my $map = cf::map::find $path; 2624 my $map = defined $path ? cf::map::find $path : undef;
2284 2625
2285 if ($map) { 2626 if ($map) {
2286 $map = $map->customise_for ($self); 2627 $map = $map->customise_for ($self);
2287 $map = $check->($map) if $check && $map; 2628 $map = $check->($map) if $check && $map;
2288 } else { 2629 } else {
2289 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2630 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2290 } 2631 }
2291 2632
2292 $map 2633 $map
2293 }; 2634 };
2294 2635
2347 $rmp->{origin_y} = $exit->y; 2688 $rmp->{origin_y} = $exit->y;
2348 } 2689 }
2349 2690
2350 $rmp->{random_seed} ||= $exit->random_seed; 2691 $rmp->{random_seed} ||= $exit->random_seed;
2351 2692
2352 my $data = cf::to_json $rmp; 2693 my $data = cf::encode_json $rmp;
2353 my $md5 = Digest::MD5::md5_hex $data; 2694 my $md5 = Digest::MD5::md5_hex $data;
2354 my $meta = "$RANDOMDIR/$md5.meta"; 2695 my $meta = "$RANDOMDIR/$md5.meta";
2355 2696
2356 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2357 aio_write $fh, 0, (length $data), $data, 0; 2698 aio_write $fh, 0, (length $data), $data, 0;
2384 # if exit is damned, update players death & WoR home-position 2725 # if exit is damned, update players death & WoR home-position
2385 $self->contr->savebed ($slaying, $hp, $sp) 2726 $self->contr->savebed ($slaying, $hp, $sp)
2386 if $exit->flag (FLAG_DAMNED); 2727 if $exit->flag (FLAG_DAMNED);
2387 2728
2388 (async { 2729 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2731
2389 $self->deactivate_recursive; # just to be sure 2732 $self->deactivate_recursive; # just to be sure
2390 unless (eval { 2733 unless (eval {
2391 $self->goto ($slaying, $hp, $sp); 2734 $self->goto ($slaying, $hp, $sp);
2392 2735
2393 1; 2736 1;
2419 2762
2420 utf8::encode $text; 2763 utf8::encode $text;
2421 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2764 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2422} 2765}
2423 2766
2424=item $client->send_msg ($color, $type, $msg, [extra...]) 2767=item $client->send_msg ($channel, $msg, $color, [extra...])
2425 2768
2426Send a drawinfo or msg packet to the client, formatting the msg for the 2769Send 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 2770client 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 2771the message, with C<log> being the default. If C<$color> is negative, suppress
2429the message unless the client supports the msg packet. 2772the message unless the client supports the msg packet.
2430 2773
2431=cut 2774=cut
2432 2775
2776# non-persistent channels (usually the info channel)
2777our %CHANNEL = (
2778 "c/identify" => {
2779 id => "infobox",
2780 title => "Identify",
2781 reply => undef,
2782 tooltip => "Items recently identified",
2783 },
2784 "c/examine" => {
2785 id => "infobox",
2786 title => "Examine",
2787 reply => undef,
2788 tooltip => "Signs and other items you examined",
2789 },
2790 "c/book" => {
2791 id => "infobox",
2792 title => "Book",
2793 reply => undef,
2794 tooltip => "The contents of a note or book",
2795 },
2796 "c/lookat" => {
2797 id => "infobox",
2798 title => "Look",
2799 reply => undef,
2800 tooltip => "What you saw there",
2801 },
2802 "c/who" => {
2803 id => "infobox",
2804 title => "Players",
2805 reply => undef,
2806 tooltip => "Shows players who are currently online",
2807 },
2808 "c/body" => {
2809 id => "infobox",
2810 title => "Body Parts",
2811 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available",
2813 },
2814 "c/uptime" => {
2815 id => "infobox",
2816 title => "Uptime",
2817 reply => undef,
2818 tooltip => "How long the server has been running since last restart",
2819 },
2820 "c/mapinfo" => {
2821 id => "infobox",
2822 title => "Map Info",
2823 reply => undef,
2824 tooltip => "Information related to the maps",
2825 },
2826);
2827
2433sub cf::client::send_msg { 2828sub cf::client::send_msg {
2434 my ($self, $color, $type, $msg, @extra) = @_; 2829 my ($self, $channel, $msg, $color, @extra) = @_;
2435 2830
2436 $msg = $self->pl->expand_cfpod ($msg); 2831 $msg = $self->pl->expand_cfpod ($msg);
2437 2832
2833 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834
2835 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) {
2837 $channel = $CHANNEL{$channel};
2838
2839 $self->ext_msg (channel_info => $channel)
2840 if $self->can_msg;
2841
2842 $channel = $channel->{id};
2843
2844 } elsif (ref $channel) {
2845 # send meta info to client, if not yet sent
2846 unless (exists $self->{channel}{$channel->{id}}) {
2847 $self->{channel}{$channel->{id}} = $channel;
2848 $self->ext_msg (channel_info => $channel)
2849 if $self->can_msg;
2850 }
2851
2852 $channel = $channel->{id};
2853 }
2854
2438 return unless @extra || length $msg; 2855 return unless @extra || length $msg;
2439 2856
2440 if ($self->can_msg) { 2857 if ($self->can_msg) {
2858 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF;
2861
2441 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2862 $self->send_packet ("msg " . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2442 } else { 2864 } 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) { 2865 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones
2867 for ($msg) {
2868 1 while
2869 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2870 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2871 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2872 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2873 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2874 }
2875
2876 $color &= cf::NDI_COLOR_MASK;
2877
2878 utf8::encode $msg;
2879
2454 if (0 && $msg =~ /\[/) { 2880 if (0 && $msg =~ /\[/) {
2881 # COMMAND/INFO
2455 $self->send_packet ("drawextinfo $color 4 0 $msg") 2882 $self->send_packet ("drawextinfo $color 10 8 $msg")
2456 } else { 2883 } else {
2457 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2884 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2458 $self->send_packet ("drawinfo $color $msg") 2885 $self->send_packet ("drawinfo $color $msg")
2459 } 2886 }
2460 } 2887 }
2461 } 2888 }
2462} 2889}
2463 2890
2464=item $client->ext_event ($type, %msg) 2891=item $client->ext_msg ($type, @msg)
2465 2892
2466Sends an ext event to the client. 2893Sends an ext event to the client.
2467 2894
2468=cut 2895=cut
2469 2896
2470sub cf::client::ext_event($$%) { 2897sub cf::client::ext_msg($$@) {
2471 my ($self, $type, %msg) = @_; 2898 my ($self, $type, @msg) = @_;
2472 2899
2473 return unless $self->extcmd; 2900 if ($self->extcmd == 2) {
2474 2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove
2475 $msg{msgtype} = "event_$type"; 2903 push @msg, msgtype => "event_$type";
2476 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 }
2906}
2907
2908=item $client->ext_reply ($msgid, @msg)
2909
2910Sends an ext reply to the client.
2911
2912=cut
2913
2914sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_;
2916
2917 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2919 } elsif ($self->extcmd == 1) {
2920 #TODO: version 1, remove
2921 unshift @msg, msgtype => "reply", msgid => $id;
2922 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2923 }
2477} 2924}
2478 2925
2479=item $success = $client->query ($flags, "text", \&cb) 2926=item $success = $client->query ($flags, "text", \&cb)
2480 2927
2481Queues a query to the client, calling the given callback with 2928Queues a query to the client, calling the given callback with
2536 my ($ns, $buf) = @_; 2983 my ($ns, $buf) = @_;
2537 2984
2538 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2985 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539 2986
2540 if (ref $msg) { 2987 if (ref $msg) {
2988 my ($type, $reply, @payload) =
2989 "ARRAY" eq ref $msg
2990 ? @$msg
2991 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2992
2993 my @reply;
2994
2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2995 if (my $cb = $EXTICMD{$type}) {
2542 if (my %reply = $cb->($ns, $msg)) { 2996 @reply = $cb->($ns, @payload);
2543 $reply{msgid} = $msg->{msgid};
2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545 }
2546 } 2997 }
2998
2999 $ns->ext_reply ($reply, @reply)
3000 if $reply;
3001
2547 } else { 3002 } else {
2548 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3003 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2549 } 3004 }
2550 3005
2551 cf::override; 3006 cf::override;
2598our $safe = new Safe "safe"; 3053our $safe = new Safe "safe";
2599our $safe_hole = new Safe::Hole; 3054our $safe_hole = new Safe::Hole;
2600 3055
2601$SIG{FPE} = 'IGNORE'; 3056$SIG{FPE} = 'IGNORE';
2602 3057
2603$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3058$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math
3060 grepstart grepwhile mapstart mapwhile
3061 sort time
3062));
2604 3063
2605# here we export the classes and methods available to script code 3064# here we export the classes and methods available to script code
2606 3065
2607=pod 3066=pod
2608 3067
2609The following functions and methods are available within a safe environment: 3068The following functions and methods are available within a safe environment:
2610 3069
2611 cf::object 3070 cf::object
2612 contr pay_amount pay_player map x y force_find force_add 3071 contr pay_amount pay_player map x y force_find force_add destroy
2613 insert remove 3072 insert remove name archname title slaying race decrease_ob_nr
2614 3073
2615 cf::object::player 3074 cf::object::player
2616 player 3075 player
2617 3076
2618 cf::player 3077 cf::player
2623 3082
2624=cut 3083=cut
2625 3084
2626for ( 3085for (
2627 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3086 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3087 insert remove inv name archname title slaying race
2628 insert remove)], 3088 decrease_ob_nr destroy)],
2629 ["cf::object::player" => qw(player)], 3089 ["cf::object::player" => qw(player)],
2630 ["cf::player" => qw(peaceful)], 3090 ["cf::player" => qw(peaceful)],
2631 ["cf::map" => qw(trigger)], 3091 ["cf::map" => qw(trigger)],
2632) { 3092) {
2633 no strict 'refs'; 3093 no strict 'refs';
2709# the server's init and main functions 3169# the server's init and main functions
2710 3170
2711sub load_facedata($) { 3171sub load_facedata($) {
2712 my ($path) = @_; 3172 my ($path) = @_;
2713 3173
3174 # HACK to clear player env face cache, we need some signal framework
3175 # for this (global event?)
3176 %ext::player_env::MUSIC_FACE_CACHE = ();
3177
3178 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3179
2714 warn "loading facedata from $path\n"; 3180 warn "loading facedata from $path\n";
2715 3181
2716 my $facedata; 3182 my $facedata;
2717 0 < aio_load $path, $facedata 3183 0 < aio_load $path, $facedata
2718 or die "$path: $!"; 3184 or die "$path: $!";
2720 $facedata = Coro::Storable::thaw $facedata; 3186 $facedata = Coro::Storable::thaw $facedata;
2721 3187
2722 $facedata->{version} == 2 3188 $facedata->{version} == 2
2723 or cf::cleanup "$path: version mismatch, cannot proceed."; 3189 or cf::cleanup "$path: version mismatch, cannot proceed.";
2724 3190
3191 # patch in the exptable
3192 $facedata->{resource}{"res/exp_table"} = {
3193 type => FT_RSRC,
3194 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3195 };
3196 cf::cede_to_tick;
3197
2725 { 3198 {
2726 my $faces = $facedata->{faceinfo}; 3199 my $faces = $facedata->{faceinfo};
2727 3200
2728 while (my ($face, $info) = each %$faces) { 3201 while (my ($face, $info) = each %$faces) {
2729 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3202 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3203
2730 cf::face::set_visibility $idx, $info->{visibility}; 3204 cf::face::set_visibility $idx, $info->{visibility};
2731 cf::face::set_magicmap $idx, $info->{magicmap}; 3205 cf::face::set_magicmap $idx, $info->{magicmap};
2732 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3206 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2733 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3207 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2734 3208
2735 cf::cede_to_tick; 3209 cf::cede_to_tick;
2736 } 3210 }
2737 3211
2738 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
2739 next unless $info->{smooth}; 3213 next unless $info->{smooth};
3214
2740 my $idx = cf::face::find $face 3215 my $idx = cf::face::find $face
2741 or next; 3216 or next;
3217
2742 if (my $smooth = cf::face::find $info->{smooth}) { 3218 if (my $smooth = cf::face::find $info->{smooth}) {
2743 cf::face::set_smooth $idx, $smooth; 3219 cf::face::set_smooth $idx, $smooth;
2744 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3220 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2745 } else { 3221 } else {
2746 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3222 warn "smooth face '$info->{smooth}' not found for face '$face'";
2763 3239
2764 { 3240 {
2765 # TODO: for gcfclient pleasure, we should give resources 3241 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index. 3242 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource}; 3243 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical;
2769 3244
2770 while (my ($name, $info) = each %$res) { 3245 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({ 3246 if (defined $info->{type}) {
2772 name => $name,
2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO#
2775 });
2776 my $data = pack "(w/a*)*", $meta, $info->{data};
2777 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2778
2779 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3247 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3248 my $data;
3249
3250 if ($info->{type} & 1) {
3251 # prepend meta info
3252
3253 my $meta = $enc->encode ({
3254 name => $name,
3255 %{ $info->{meta} || {} },
3256 });
3257
3258 $data = pack "(w/a*)*", $meta, $info->{data};
3259 } else {
3260 $data = $info->{data};
3261 }
3262
3263 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2780 cf::face::set_type $idx, 1; 3264 cf::face::set_type $idx, $info->{type};
2781 cf::face::set_data $idx, 0, $data, $chk; 3265 } else {
3266 $RESOURCE{$name} = $info;
3267 }
2782 3268
2783 cf::cede_to_tick; 3269 cf::cede_to_tick;
2784 } 3270 }
2785 } 3271 }
2786 3272
3273 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3274
2787 1 3275 1
2788} 3276}
2789 3277
3278cf::global->attach (on_resource_update => sub {
3279 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3280 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3281
3282 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3283 my $sound = $soundconf->{compat}[$_]
3284 or next;
3285
3286 my $face = cf::face::find "sound/$sound->[1]";
3287 cf::sound::set $sound->[0] => $face;
3288 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3289 }
3290
3291 while (my ($k, $v) = each %{$soundconf->{event}}) {
3292 my $face = cf::face::find "sound/$v";
3293 cf::sound::set $k => $face;
3294 }
3295 }
3296});
3297
3298register_exticmd fx_want => sub {
3299 my ($ns, $want) = @_;
3300
3301 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v);
3303 }
3304};
3305
2790sub reload_regions { 3306sub reload_regions {
3307 # HACK to clear player env face cache, we need some signal framework
3308 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = ();
3310
2791 load_resource_file "$MAPDIR/regions" 3311 load_resource_file "$MAPDIR/regions"
2792 or die "unable to load regions file\n"; 3312 or die "unable to load regions file\n";
2793 3313
2794 for (cf::region::list) { 3314 for (cf::region::list) {
2795 $_->{match} = qr/$_->{match}/ 3315 $_->{match} = qr/$_->{match}/
2831 3351
2832sub init { 3352sub init {
2833 reload_resources; 3353 reload_resources;
2834} 3354}
2835 3355
2836sub cfg_load { 3356sub reload_config {
2837 open my $fh, "<:utf8", "$CONFDIR/config" 3357 open my $fh, "<:utf8", "$CONFDIR/config"
2838 or return; 3358 or return;
2839 3359
2840 local $/; 3360 local $/;
2841 *CFG = YAML::Syck::Load <$fh>; 3361 *CFG = YAML::Load <$fh>;
2842 3362
2843 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3363 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2844 3364
2845 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3365 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2846 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3366 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2857sub main { 3377sub main {
2858 # we must not ever block the main coroutine 3378 # we must not ever block the main coroutine
2859 local $Coro::idle = sub { 3379 local $Coro::idle = sub {
2860 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3380 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2861 (async { 3381 (async {
2862 Event::one_event; 3382 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT;
2863 })->prio (Coro::PRIO_MAX); 3384 })->prio (Coro::PRIO_MAX);
2864 }; 3385 };
2865 3386
2866 cfg_load; 3387 reload_config;
2867 db_init; 3388 db_init;
2868 load_extensions; 3389 load_extensions;
2869 3390
2870 $TICK_WATCHER->start; 3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno;
2871 Event::loop; 3393 EV::loop;
2872} 3394}
2873 3395
2874############################################################################# 3396#############################################################################
2875# initialisation and cleanup 3397# initialisation and cleanup
2876 3398
2877# install some emergency cleanup handlers 3399# install some emergency cleanup handlers
2878BEGIN { 3400BEGIN {
3401 our %SIGWATCHER = ();
2879 for my $signal (qw(INT HUP TERM)) { 3402 for my $signal (qw(INT HUP TERM)) {
2880 Event->signal ( 3403 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2881 reentrant => 0,
2882 data => WF_AUTOCANCEL,
2883 signal => $signal,
2884 prio => 0,
2885 cb => sub {
2886 cf::cleanup "SIG$signal"; 3404 cf::cleanup "SIG$signal";
2887 },
2888 ); 3405 };
2889 } 3406 }
2890} 3407}
2891 3408
2892sub write_runtime { 3409sub write_runtime {
2893 my $runtime = "$LOCALDIR/runtime"; 3410 my $runtime = "$LOCALDIR/runtime";
2923 and return; 3440 and return;
2924 3441
2925 warn "runtime file written.\n"; 3442 warn "runtime file written.\n";
2926 3443
2927 1 3444 1
3445}
3446
3447our $uuid_lock;
3448our $uuid_skip;
3449
3450sub write_uuid_sync($) {
3451 $uuid_skip ||= $_[0];
3452
3453 return if $uuid_lock;
3454 local $uuid_lock = 1;
3455
3456 my $uuid = "$LOCALDIR/uuid";
3457
3458 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3459 or return;
3460
3461 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3462 $uuid_skip = 0;
3463
3464 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3465 and return;
3466
3467 # always fsync - this file is important
3468 aio_fsync $fh
3469 and return;
3470
3471 close $fh
3472 or return;
3473
3474 aio_rename "$uuid~", $uuid
3475 and return;
3476
3477 warn "uuid file written ($value).\n";
3478
3479 1
3480
3481}
3482
3483sub write_uuid($$) {
3484 my ($skip, $sync) = @_;
3485
3486 $sync ? write_uuid_sync $skip
3487 : async { write_uuid_sync $skip };
2928} 3488}
2929 3489
2930sub emergency_save() { 3490sub emergency_save() {
2931 my $freeze_guard = cf::freeze_mainloop; 3491 my $freeze_guard = cf::freeze_mainloop;
2932 3492
2938 # and maps saved/destroyed asynchronously. 3498 # and maps saved/destroyed asynchronously.
2939 warn "begin emergency player save\n"; 3499 warn "begin emergency player save\n";
2940 for my $login (keys %cf::PLAYER) { 3500 for my $login (keys %cf::PLAYER) {
2941 my $pl = $cf::PLAYER{$login} or next; 3501 my $pl = $cf::PLAYER{$login} or next;
2942 $pl->valid or next; 3502 $pl->valid or next;
3503 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2943 $pl->save; 3504 $pl->save;
2944 } 3505 }
2945 warn "end emergency player save\n"; 3506 warn "end emergency player save\n";
2946 3507
2947 warn "begin emergency map save\n"; 3508 warn "begin emergency map save\n";
2953 warn "end emergency map save\n"; 3514 warn "end emergency map save\n";
2954 3515
2955 warn "begin emergency database checkpoint\n"; 3516 warn "begin emergency database checkpoint\n";
2956 BDB::db_env_txn_checkpoint $DB_ENV; 3517 BDB::db_env_txn_checkpoint $DB_ENV;
2957 warn "end emergency database checkpoint\n"; 3518 warn "end emergency database checkpoint\n";
3519
3520 warn "begin write uuid\n";
3521 write_uuid_sync 1;
3522 warn "end write uuid\n";
2958 }; 3523 };
2959 3524
2960 warn "leave emergency perl save\n"; 3525 warn "leave emergency perl save\n";
2961} 3526}
2962 3527
2986 warn "syncing database to disk"; 3551 warn "syncing database to disk";
2987 BDB::db_env_txn_checkpoint $DB_ENV; 3552 BDB::db_env_txn_checkpoint $DB_ENV;
2988 3553
2989 # if anything goes wrong in here, we should simply crash as we already saved 3554 # if anything goes wrong in here, we should simply crash as we already saved
2990 3555
2991 warn "cancelling all WF_AUTOCANCEL watchers";
2992 for (Event::all_watchers) {
2993 $_->cancel if $_->data & WF_AUTOCANCEL;
2994 }
2995
2996 warn "flushing outstanding aio requests"; 3556 warn "flushing outstanding aio requests";
2997 for (;;) { 3557 for (;;) {
2998 BDB::flush; 3558 BDB::flush;
2999 IO::AIO::flush; 3559 IO::AIO::flush;
3000 Coro::cede; 3560 Coro::cede_notself;
3001 last unless IO::AIO::nreqs || BDB::nreqs; 3561 last unless IO::AIO::nreqs || BDB::nreqs;
3002 warn "iterate..."; 3562 warn "iterate...";
3003 } 3563 }
3004 3564
3005 ++$RELOAD; 3565 ++$RELOAD;
3064 warn "reloading cf.pm"; 3624 warn "reloading cf.pm";
3065 require cf; 3625 require cf;
3066 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3626 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3067 3627
3068 warn "loading config and database again"; 3628 warn "loading config and database again";
3069 cf::cfg_load; 3629 cf::reload_config;
3070 3630
3071 warn "loading extensions"; 3631 warn "loading extensions";
3072 cf::load_extensions; 3632 cf::load_extensions;
3073 3633
3074 warn "reattaching attachments to objects/players"; 3634 warn "reattaching attachments to objects/players";
3081 warn "leaving sync_job"; 3641 warn "leaving sync_job";
3082 3642
3083 1 3643 1
3084 } or do { 3644 } or do {
3085 warn $@; 3645 warn $@;
3086 warn "error while reloading, exiting."; 3646 cf::cleanup "error while reloading, exiting.";
3087 exit 1;
3088 }; 3647 };
3089 3648
3090 warn "reloaded"; 3649 warn "reloaded";
3091}; 3650};
3092 3651
3094 3653
3095sub reload_perl() { 3654sub reload_perl() {
3096 # doing reload synchronously and two reloads happen back-to-back, 3655 # doing reload synchronously and two reloads happen back-to-back,
3097 # coro crashes during coro_state_free->destroy here. 3656 # coro crashes during coro_state_free->destroy here.
3098 3657
3099 $RELOAD_WATCHER ||= Event->timer ( 3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3100 reentrant => 0,
3101 after => 0,
3102 data => WF_AUTOCANCEL,
3103 cb => sub {
3104 do_reload_perl; 3659 do_reload_perl;
3105 undef $RELOAD_WATCHER; 3660 undef $RELOAD_WATCHER;
3106 },
3107 ); 3661 };
3108} 3662}
3109 3663
3110register_command "reload" => sub { 3664register_command "reload" => sub {
3111 my ($who, $arg) = @_; 3665 my ($who, $arg) = @_;
3112 3666
3113 if ($who->flag (FLAG_WIZ)) { 3667 if ($who->flag (FLAG_WIZ)) {
3114 $who->message ("reloading server."); 3668 $who->message ("reloading server.");
3669 async {
3670 $Coro::current->{desc} = "perl_reload";
3115 async { reload_perl }; 3671 reload_perl;
3672 };
3116 } 3673 }
3117}; 3674};
3118 3675
3119unshift @INC, $LIBDIR; 3676unshift @INC, $LIBDIR;
3120 3677
3122 3679
3123our @WAIT_FOR_TICK; 3680our @WAIT_FOR_TICK;
3124our @WAIT_FOR_TICK_BEGIN; 3681our @WAIT_FOR_TICK_BEGIN;
3125 3682
3126sub wait_for_tick { 3683sub wait_for_tick {
3127 return unless $TICK_WATCHER->is_active; 3684 return if tick_inhibit;
3128 return if $Coro::current == $Coro::main; 3685 return if $Coro::current == $Coro::main;
3129 3686
3130 my $signal = new Coro::Signal; 3687 my $signal = new Coro::Signal;
3131 push @WAIT_FOR_TICK, $signal; 3688 push @WAIT_FOR_TICK, $signal;
3132 $signal->wait; 3689 $signal->wait;
3133} 3690}
3134 3691
3135sub wait_for_tick_begin { 3692sub wait_for_tick_begin {
3136 return unless $TICK_WATCHER->is_active; 3693 return if tick_inhibit;
3137 return if $Coro::current == $Coro::main; 3694 return if $Coro::current == $Coro::main;
3138 3695
3139 my $signal = new Coro::Signal; 3696 my $signal = new Coro::Signal;
3140 push @WAIT_FOR_TICK_BEGIN, $signal; 3697 push @WAIT_FOR_TICK_BEGIN, $signal;
3141 $signal->wait; 3698 $signal->wait;
3142} 3699}
3143 3700
3144 my $min = 1e6;#d# 3701sub tick {
3145 my $avg = 10;
3146$TICK_WATCHER = Event->timer (
3147 reentrant => 0,
3148 parked => 1,
3149 prio => 0,
3150 at => $NEXT_TICK || $TICK,
3151 data => WF_AUTOCANCEL,
3152 cb => sub {
3153 if ($Coro::current != $Coro::main) { 3702 if ($Coro::current != $Coro::main) {
3154 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3703 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3155 unless ++$bug_warning > 10; 3704 unless ++$bug_warning > 10;
3156 return; 3705 return;
3157 } 3706 }
3158 3707
3159 $NOW = $tick_start = Event::time;
3160
3161 cf::server_tick; # one server iteration 3708 cf::server_tick; # one server iteration
3162 3709
3163 0 && sync_job {#d# 3710 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3164 for(1..10) { 3711 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3165 my $t = Event::time; 3712 Coro::async_pool {
3166 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3713 $Coro::current->{desc} = "runtime saver";
3167 or die; 3714 write_runtime
3168 3715 or warn "ERROR: unable to write runtime file: $!";
3169 $map->width (50);
3170 $map->height (50);
3171 $map->alloc;
3172 $map->_load_objects ("/tmp/x.map", 1);
3173 my $t = Event::time - $t;
3174
3175 #next unless $t < 0.0013;#d#
3176 if ($t < $min) {
3177 $min = $t;
3178 }
3179 $avg = $avg * 0.99 + $t * 0.01;
3180 }
3181 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3182 exit 0;
3183 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3184 }; 3716 };
3717 }
3185 3718
3186 $RUNTIME += $TICK;
3187 $NEXT_TICK += $TICK;
3188
3189 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3190 $NEXT_RUNTIME_WRITE = $NOW + 10;
3191 Coro::async_pool {
3192 write_runtime
3193 or warn "ERROR: unable to write runtime file: $!";
3194 };
3195 }
3196
3197# my $AFTER = Event::time;
3198# warn $AFTER - $NOW;#d#
3199
3200 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3719 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3201 $sig->send; 3720 $sig->send;
3202 } 3721 }
3203 while (my $sig = shift @WAIT_FOR_TICK) { 3722 while (my $sig = shift @WAIT_FOR_TICK) {
3204 $sig->send; 3723 $sig->send;
3205 } 3724 }
3206 3725
3207 $NOW = Event::time; 3726 $LOAD = ($NOW - $TICK_START) / $TICK;
3208
3209 # if we are delayed by four ticks or more, skip them all
3210 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3211
3212 $TICK_WATCHER->at ($NEXT_TICK);
3213 $TICK_WATCHER->start;
3214
3215 $LOAD = ($NOW - $tick_start) / $TICK;
3216 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3727 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3217 3728
3218 _post_tick; 3729 if (0) {
3219 3730 if ($NEXT_TICK) {
3220 3731 my $jitter = $TICK_START - $NEXT_TICK;
3732 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3733 warn "jitter $JITTER\n";#d#
3734 }
3221 }, 3735 }
3222); 3736}
3223 3737
3224{ 3738{
3225 BDB::max_poll_time $TICK * 0.1; 3739 # configure BDB
3226 $BDB_POLL_WATCHER = Event->io ( 3740
3227 reentrant => 0,
3228 fd => BDB::poll_fileno,
3229 poll => 'r',
3230 prio => 0,
3231 data => WF_AUTOCANCEL,
3232 cb => \&BDB::poll_cb,
3233 );
3234 BDB::min_parallel 8; 3741 BDB::min_parallel 8;
3235 3742 BDB::max_poll_reqs $TICK * 0.1;
3236 BDB::set_sync_prepare { 3743 $Coro::BDB::WATCHER->priority (1);
3237 my $status;
3238 my $current = $Coro::current;
3239 (
3240 sub {
3241 $status = $!;
3242 $current->ready; undef $current;
3243 },
3244 sub {
3245 Coro::schedule while defined $current;
3246 $! = $status;
3247 },
3248 )
3249 };
3250 3744
3251 unless ($DB_ENV) { 3745 unless ($DB_ENV) {
3252 $DB_ENV = BDB::db_env_create; 3746 $DB_ENV = BDB::db_env_create;
3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3748 | BDB::LOG_AUTOREMOVE, 1);
3749 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3750 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3253 3751
3254 cf::sync_job { 3752 cf::sync_job {
3255 eval { 3753 eval {
3256 BDB::db_env_open 3754 BDB::db_env_open
3257 $DB_ENV, 3755 $DB_ENV,
3259 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3757 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3260 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3758 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3261 0666; 3759 0666;
3262 3760
3263 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3761 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3264
3265 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3266 $DB_ENV->set_lk_detect;
3267 }; 3762 };
3268 3763
3269 cf::cleanup "db_env_open(db): $@" if $@; 3764 cf::cleanup "db_env_open(db): $@" if $@;
3270 }; 3765 };
3271 } 3766 }
3767
3768 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3769 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3770 };
3771 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3772 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3773 };
3774 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3775 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3776 };
3272} 3777}
3273 3778
3274{ 3779{
3780 # configure IO::AIO
3781
3275 IO::AIO::min_parallel 8; 3782 IO::AIO::min_parallel 8;
3276
3277 undef $Coro::AIO::WATCHER;
3278 IO::AIO::max_poll_time $TICK * 0.1; 3783 IO::AIO::max_poll_time $TICK * 0.1;
3279 $AIO_POLL_WATCHER = Event->io ( 3784 $Coro::AIO::WATCHER->priority (1);
3280 reentrant => 0,
3281 data => WF_AUTOCANCEL,
3282 fd => IO::AIO::poll_fileno,
3283 poll => 'r',
3284 prio => 6,
3285 cb => \&IO::AIO::poll_cb,
3286 );
3287} 3785}
3288 3786
3289my $_log_backtrace; 3787my $_log_backtrace;
3290 3788
3291sub _log_backtrace { 3789sub _log_backtrace {
3295 3793
3296 # limit the # of concurrent backtraces 3794 # limit the # of concurrent backtraces
3297 if ($_log_backtrace < 2) { 3795 if ($_log_backtrace < 2) {
3298 ++$_log_backtrace; 3796 ++$_log_backtrace;
3299 async { 3797 async {
3798 $Coro::current->{desc} = "abt $msg";
3799
3300 my @bt = fork_call { 3800 my @bt = fork_call {
3301 @addr = map { sprintf "%x", $_ } @addr; 3801 @addr = map { sprintf "%x", $_ } @addr;
3302 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3802 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3303 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3803 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3304 or die "addr2line: $!"; 3804 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines