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.283 by root, Sun Jun 24 04:09:29 2007 UTC vs.
Revision 1.441 by root, Sat Aug 30 05:19:03 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
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.61 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
49use Coro::Util ();
24 50
51use JSON::XS 2.01 ();
25use BDB (); 52use BDB ();
26use Data::Dumper; 53use Data::Dumper;
27use Digest::MD5; 54use Digest::MD5;
28use Fcntl; 55use Fcntl;
29use YAML::Syck (); 56use YAML ();
30use IO::AIO 2.32 (); 57use IO::AIO ();
31use Time::HiRes; 58use Time::HiRes;
32use Compress::LZF; 59use Compress::LZF;
60use Digest::MD5 ();
61
62AnyEvent::detect;
33 63
34# configure various modules to our taste 64# configure various modules to our taste
35# 65#
36$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 69
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 71
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 73
49our %COMMAND = (); 74our %COMMAND = ();
50our %COMMAND_TIME = (); 75our %COMMAND_TIME = ();
51 76
52our @EXTS = (); # list of extension package names 77our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 78our %EXTCMD = ();
79our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 80our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 81our %EXT_MAP = (); # pluggable maps
56 82
57our $RELOAD; # number of reloads so far 83our $RELOAD; # number of reloads so far
58our @EVENT; 84our @EVENT;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
71 98
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 101our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
79 103
104our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 106our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 107our $DB_ENV;
82 108
83our %CFG; 109our %CFG;
84 110
85our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 112our $RUNTIME;
113our $NOW;
87 114
88our %PLAYER; # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 116our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
91 118
92# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 121
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
98 126
99binmode STDOUT; 127binmode STDOUT;
100binmode STDERR; 128binmode STDERR;
101 129
102# read virtual server time, if available 130# read virtual server time, if available
155 183
156The raw value load value from the last tick. 184The raw value load value from the last tick.
157 185
158=item %cf::CFG 186=item %cf::CFG
159 187
160Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 189from wherever your confdir points to.
162 190
163=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
164 192
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 193These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 194returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 195per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 196
197=item @cf::INVOKE_RESULTS
198
199This array contains the results of the last C<invoke ()> call. When
200C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
201that call.
202
169=back 203=back
170 204
171=cut 205=cut
172 206
173BEGIN { 207BEGIN {
177 $msg .= "\n" 211 $msg .= "\n"
178 unless $msg =~ /\n$/; 212 unless $msg =~ /\n$/;
179 213
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 215
182 utf8::encode $msg;
183 LOG llevError, $msg; 216 LOG llevError, $msg;
184 }; 217 };
185} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
186 234
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
197for my $pkg (qw( 245for my $pkg (qw(
198 cf::global cf::attachable 246 cf::global cf::attachable
199 cf::object cf::object::player 247 cf::object cf::object::player
200 cf::client cf::player 248 cf::client cf::player
201 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
202 cf::map cf::party cf::region 251 cf::party cf::region
203)) { 252)) {
204 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 254}
207 255
208$Event::DIED = sub { 256$EV::DIED = sub {
209 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
210}; 258};
211 259
212############################################################################# 260#############################################################################
213 261
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 284 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 285 $d
238 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
239} 287}
240 288
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
244 290
245Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
246 292
247=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
248 294
249Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
296
297=cut
298
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300
301sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) }
250 303
251=item cf::lock_wait $string 304=item cf::lock_wait $string
252 305
253Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
254 307
257Wait until the given lock is available and then acquires it and returns 310Wait until the given lock is available and then acquires it and returns
258a Coro::guard object. If the guard object gets destroyed (goes out of scope, 311a Coro::guard object. If the guard object gets destroyed (goes out of scope,
259for example when the coroutine gets canceled), the lock is automatically 312for example when the coroutine gets canceled), the lock is automatically
260returned. 313returned.
261 314
315Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro.
317
262Lock names should begin with a unique identifier (for example, cf::map::find 318Lock names should begin with a unique identifier (for example, cf::map::find
263uses map_find and cf::map::load uses map_load). 319uses map_find and cf::map::load uses map_load).
264 320
265=item $locked = cf::lock_active $string 321=item $locked = cf::lock_active $string
266 322
267Return true if the lock is currently active, i.e. somebody has locked it. 323Return true if the lock is currently active, i.e. somebody has locked it.
268 324
269=cut 325=cut
270 326
271our %LOCK; 327our %LOCK;
328our %LOCKER;#d#
272 329
273sub lock_wait($) { 330sub lock_wait($) {
274 my ($key) = @_; 331 my ($key) = @_;
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
275 337
276 # wait for lock, if any 338 # wait for lock, if any
277 while ($LOCK{$key}) { 339 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current; 340 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule; 341 Coro::schedule;
285 347
286 # wait, to be sure we are not locked 348 # wait, to be sure we are not locked
287 lock_wait $key; 349 lock_wait $key;
288 350
289 $LOCK{$key} = []; 351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
290 353
291 Coro::guard { 354 Coro::guard {
355 delete $LOCKER{$key};#d#
292 # wake up all waiters, to be on the safe side 356 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} }; 357 $_->ready for @{ delete $LOCK{$key} };
294 } 358 }
295} 359}
296 360
299 363
300 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
301} 365}
302 366
303sub freeze_mainloop { 367sub freeze_mainloop {
304 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
305 369
306 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
307 $TICK_WATCHER->start; 371}
372
373=item cf::periodic $interval, $cb
374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
386}
387
388=item cf::get_slot $time[, $priority[, $name]]
389
390Allocate $time seconds of blocking CPU time at priority C<$priority>:
391This call blocks and returns only when you have at least C<$time> seconds
392of cpu time till the next tick. The slot is only valid till the next cede.
393
394The optional C<$name> can be used to identify the job to run. It might be
395used for statistical purposes and should identify the same time-class.
396
397Useful for short background jobs.
398
399=cut
400
401our @SLOT_QUEUE;
402our $SLOT_QUEUE;
403
404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
408 my $signal = new Coro::Signal;
409
410 while () {
411 next_job:
412 my $avail = cf::till_tick;
413 if ($avail > 0.01) {
414 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) {
416 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send;
418 Coro::cede;
419 goto next_job;
420 }
421 }
422 }
423
424 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait;
428 } else {
429 Coro::schedule;
430 }
308 }; 431 }
309 $TICK_WATCHER->stop; 432};
310 $guard 433
434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
437 my ($time, $pri, $name) = @_;
438
439 $time = $TICK * .6 if $time > $TICK * .6;
440 my $sig = new Coro::Signal;
441
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready;
445 $sig->wait;
311} 446}
312 447
313=item cf::async { BLOCK } 448=item cf::async { BLOCK }
314 449
315Currently the same as Coro::async_pool, meaning you cannot use 450Currently the same as Coro::async_pool, meaning you cannot use
320 455
321BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
322 457
323=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
324 459
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
327partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable. 463acceptable.
329 464
330If it must be done, put the blocking parts into C<sync_job>. This will run 465If it must be done, put the blocking parts into C<sync_job>. This will run
331the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
336 471
337sub sync_job(&) { 472sub sync_job(&) {
338 my ($job) = @_; 473 my ($job) = @_;
339 474
340 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
341 my $time = Event::time; 476 my $time = EV::time;
342 477
343 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
345 480
346 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
347 # (but this is cancel-safe) 482
348 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
349 484
350 my $busy = 1; 485 my $busy = 1;
351 my @res; 486 my @res;
352 487
353 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 490 @res = eval { $job->() };
355 warn $@ if $@; 491 warn $@ if $@;
356 undef $busy; 492 undef $busy;
357 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
358 494
359 while ($busy) { 495 while ($busy) {
360 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
361 } 500 }
501 }
362 502
363 $time = Event::time - $time; 503 my $time = EV::time - $time;
364 504
365 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367
368 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
369 506
370 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
371 } else { 508 } else {
372 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
373 510
398=item fork_call { }, $args 535=item fork_call { }, $args
399 536
400Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
404 541
405=cut 542=cut
406 543
407sub fork_call(&@) { 544sub fork_call(&@) {
408 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
409 546
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 547 # we seemingly have to make a local copy of the whole thing,
411# or die "socketpair: $!"; 548 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 549 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 550
415 if (my $pid = fork) { 551 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 552 reset_signals;
428 local $SIG{__WARN__}; 553 &$cb
429 local $SIG{__DIE__}; 554 }, @args;
430 eval {
431 close $fh1;
432 555
433 my @res = eval { $cb->(@args) }; 556 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 557}
435 };
436 558
437 warn $@ if $@; 559=item $coin = coin_from_name $name
438 _exit 0; 560
439 } 561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
440} 584}
441 585
442=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
443 587
444Returns a single value from the environment database. 588Returns a single value from the environment database.
446=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
447 591
448Stores the given C<$value> in the family. It can currently store binary 592Stores the given C<$value> in the family. It can currently store binary
449data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 593data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450 594
595=item $db = cf::db_table "name"
596
597Create and/or open a new database table. The string must not be "db" and must be unique
598within each server.
599
451=cut 600=cut
601
602sub db_table($) {
603 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV;
605
606 eval {
607 $db->set_flags (BDB::CHKSUM);
608
609 utf8::encode $name;
610 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
611 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
612 cf::cleanup "db_open(db): $!" if $!;
613 };
614 cf::cleanup "db_open(db): $@" if $@;
615
616 $db
617}
452 618
453our $DB; 619our $DB;
454 620
455sub db_init { 621sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 622 cf::sync_job {
460 eval { 623 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 624 };
470} 625}
471 626
472sub db_get($$) { 627sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
474 629
524 if (1) { 679 if (1) {
525 $md5 = 680 $md5 =
526 join "\x00", 681 join "\x00",
527 $processversion, 682 $processversion,
528 map { 683 map {
529 Coro::cede; 684 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 685 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 686 } 0.. $#$src;
532 687
533 688
534 my $dbmd5 = db_get cache => "$id/md5"; 689 my $dbmd5 = db_get cache => "$id/md5";
578attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
580 735
581In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
582C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
583Crossfire TRT). 738Deliantra).
584 739
585=over 4 740=over 4
586 741
587=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
588 743
840 "; 995 ";
841 die if $@; 996 die if $@;
842} 997}
843 998
844our $override; 999our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1000our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 1001
847sub override { 1002sub override {
848 $override = 1; 1003 $override = 1;
849 @invoke_results = (); 1004 @INVOKE_RESULTS = (@_);
850} 1005}
851 1006
852sub do_invoke { 1007sub do_invoke {
853 my $event = shift; 1008 my $event = shift;
854 my $callbacks = shift; 1009 my $callbacks = shift;
855 1010
856 @invoke_results = (); 1011 @INVOKE_RESULTS = ();
857 1012
858 local $override; 1013 local $override;
859 1014
860 for (@$callbacks) { 1015 for (@$callbacks) {
861 eval { &{$_->[1]} }; 1016 eval { &{$_->[1]} };
870 } 1025 }
871 1026
872 0 1027 0
873} 1028}
874 1029
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 1031
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 1033
879Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
880 1035
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1036This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 1037removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 1038results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 1039
885=back 1040=back
886 1041
887=cut 1042=cut
888 1043
889############################################################################# 1044#############################################################################
890# object support 1045# object support
1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
1080sub _can_merge {
1081 my ($ob1, $ob2) = @_;
1082
1083 ++$SLOW_MERGES;#d#
1084
1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
1087}
891 1088
892sub reattach { 1089sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1091 my ($obj) = @_;
895 1092
1093 # no longer needed after getting rid of delete_package?
896 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
897 1095
898 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
899 1097
900 @$registry = (); 1098 @$registry = ();
901 1099
916cf::attachable->attach ( 1114cf::attachable->attach (
917 prio => -1000000, 1115 prio => -1000000,
918 on_instantiate => sub { 1116 on_instantiate => sub {
919 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
920 1118
921 $data = from_json $data; 1119 $data = decode_json $data;
922 1120
923 for (@$data) { 1121 for (@$data) {
924 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
925 1123
926 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
942sub object_freezer_save { 1140sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
944 1142
945 sync_job { 1143 sync_job {
946 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
949 1148
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1153 aio_close $fh;
955 1154
956 if (@$objs) { 1155 if (@$objs) {
957 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1161 aio_close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
964 } 1163 }
965 } else { 1164 } else {
966 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
967 } 1166 }
972 } 1171 }
973 } else { 1172 } else {
974 aio_unlink $filename; 1173 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1174 aio_unlink "$filename.pst";
976 } 1175 }
977 } 1176 };
978} 1177}
979 1178
980sub object_freezer_as_string { 1179sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1180 my ($rdata, $objs) = @_;
982 1181
994 or return; 1193 or return;
995 1194
996 unless (aio_stat "$filename.pst") { 1195 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1196 (aio_load "$filename.pst", $av) >= 0
998 or return; 1197 or return;
1198
999 $av = eval { (Storable::thaw $av)->{objs} }; 1199 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs};
1000 } 1201 }
1001 1202
1203 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1204 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1205 $decname, length $data, scalar @{$av || []};
1206
1004 return ($data, $av); 1207 ($data, $av)
1005} 1208}
1006 1209
1007=head2 COMMAND CALLBACKS 1210=head2 COMMAND CALLBACKS
1008 1211
1009=over 4 1212=over 4
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1232 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1233}
1031 1234
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1235=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1236
1034Register a callback fro execution when the client sends an extcmd packet. 1237Register a callback for execution when the client sends an (synchronous)
1238extcmd packet. Ext commands will be processed in the order they are
1239received by the server, like other user commands. The first argument is
1240the logged-in player. Ext commands can only be processed after a player
1241has logged in successfully.
1035 1242
1036If the callback returns something, it is sent back as if reply was being 1243If the callback returns something, it is sent back as if reply was being
1037called. 1244called.
1038 1245
1246=item cf::register_exticmd $name => \&callback($ns,$packet);
1247
1248Register a callback for execution when the client sends an (asynchronous)
1249exticmd packet. Exti commands are processed by the server as soon as they
1250are received, i.e. out of order w.r.t. other commands. The first argument
1251is a client socket. Exti commands can be received anytime, even before
1252log-in.
1253
1254If the callback returns something, it is sent back as if reply was being
1255called.
1256
1039=cut 1257=cut
1040 1258
1041sub register_extcmd { 1259sub register_extcmd {
1042 my ($name, $cb) = @_; 1260 my ($name, $cb) = @_;
1043 1261
1044 $EXTCMD{$name} = $cb; 1262 $EXTCMD{$name} = $cb;
1263}
1264
1265sub register_exticmd {
1266 my ($name, $cb) = @_;
1267
1268 $EXTICMD{$name} = $cb;
1045} 1269}
1046 1270
1047cf::player->attach ( 1271cf::player->attach (
1048 on_command => sub { 1272 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1273 my ($pl, $name, $params) = @_;
1058 cf::override; 1282 cf::override;
1059 }, 1283 },
1060 on_extcmd => sub { 1284 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1285 my ($pl, $buf) = @_;
1062 1286
1063 my $msg = eval { from_json $buf }; 1287 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1288
1065 if (ref $msg) { 1289 if (ref $msg) {
1290 my ($type, $reply, @payload) =
1291 "ARRAY" eq ref $msg
1292 ? @$msg
1293 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1294
1295 my @reply;
1296
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1297 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1298 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1299 }
1300
1301 $pl->ext_reply ($reply, @reply)
1302 if $reply;
1303
1071 } else { 1304 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1305 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1306 }
1074 1307
1075 cf::override; 1308 cf::override;
1102 1335
1103 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1104 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1105 1338
1106 $ext{source} = 1339 $ext{source} =
1107 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1108 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1109 . $source 1342 . $source
1110 . "\n};\n1"; 1343 . "\n};\n1";
1111 1344
1112 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
1128 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1130 1363
1131 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1132 warn $msg; 1365 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1134 exit 1;
1135 } 1367 }
1136 1368
1137 warn $msg; 1369 warn $msg;
1138 } 1370 }
1139 1371
1164use Coro::AIO; 1396use Coro::AIO;
1165 1397
1166=head3 cf::player 1398=head3 cf::player
1167 1399
1168=over 4 1400=over 4
1401
1402=item cf::player::num_playing
1403
1404Returns the official number of playing players, as per the Crossfire metaserver rules.
1405
1406=cut
1407
1408sub num_playing {
1409 scalar grep
1410 $_->ob->map
1411 && !$_->hidden
1412 && !$_->ob->flag (cf::FLAG_WIZ),
1413 cf::player::list
1414}
1169 1415
1170=item cf::player::find $login 1416=item cf::player::find $login
1171 1417
1172Returns the given player object, loading it if necessary (might block). 1418Returns the given player object, loading it if necessary (might block).
1173 1419
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1455 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1456 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1457 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1458 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1459
1214 my $pl = load_pl path $login 1460 my $f = new_from_file cf::object::thawer path $login
1215 or return; 1461 or return;
1462
1463 my $pl = cf::player::load_pl $f
1464 or return;
1465
1466 local $cf::PLAYER_LOADING{$login} = $pl;
1467 $f->resolve_delayed_derefs;
1216 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1217 } 1469 }
1218 } 1470 }
1219} 1471}
1220 1472
1229 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1230 1482
1231 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1233 1485
1486 cf::get_slot 0.01;
1487
1234 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1235 Coro::cede; 1489 cf::cede_to_tick;
1236} 1490}
1237 1491
1238sub new($) { 1492sub new($) {
1239 my ($login) = @_; 1493 my ($login) = @_;
1240 1494
1246 $cf::PLAYER{$login} = $self; 1500 $cf::PLAYER{$login} = $self;
1247 1501
1248 $self 1502 $self
1249} 1503}
1250 1504
1505=item $player->send_msg ($channel, $msg, $color, [extra...])
1506
1507=cut
1508
1509sub send_msg {
1510 my $ns = shift->ns
1511 or return;
1512 $ns->send_msg (@_);
1513}
1514
1251=item $pl->quit_character 1515=item $pl->quit_character
1252 1516
1253Nukes the player without looking back. If logged in, the connection will 1517Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1518be destroyed. May block for a long time.
1255 1519
1263 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1264 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we nuked the dir
1265 1529
1266 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1267 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1268 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1269 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1270 1536
1271 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1272 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1308 or return []; 1574 or return [];
1309 1575
1310 my @logins; 1576 my @logins;
1311 1577
1312 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1579 my $path = path $login;
1580
1581 # a .pst is a dead give-away for a valid player
1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1587 }
1316 1588
1317 utf8::decode $login; 1589 utf8::decode $login;
1318 push @logins, $login; 1590 push @logins, $login;
1319 } 1591 }
1320 1592
1353 1625
1354Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1355 1627
1356=cut 1628=cut
1357 1629
1630use re 'eval';
1631
1632my $group;
1633my $interior; $interior = qr{
1634 # match a pod interior sequence sans C<< >>
1635 (?:
1636 \ (.*?)\ (?{ $group = $^N })
1637 | < (??{$interior}) >
1638 )
1639}x;
1640
1358sub expand_cfpod { 1641sub expand_cfpod {
1359 ((my $self), (local $_)) = @_; 1642 my ($self, $pod) = @_;
1360 1643
1361 # escape & and < 1644 my $xml;
1362 s/&/&amp;/g;
1363 s/(?<![BIUGH])</&lt;/g;
1364 1645
1365 # this is buggy, it needs to properly take care of nested <'s 1646 while () {
1647 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1648 $group = $1;
1366 1649
1367 1 while 1650 $group =~ s/&/&amp;/g;
1368 # replace B<>, I<>, U<> etc. 1651 $group =~ s/</&lt;/g;
1369 s/B<([^\>]*)>/<b>$1<\/b>/ 1652
1370 || s/I<([^\>]*)>/<i>$1<\/i>/ 1653 $xml .= $group;
1371 || s/U<([^\>]*)>/<u>$1<\/u>/ 1654 } elsif ($pod =~ m%\G
1372 # replace G<male|female> tags 1655 ([BCGHITU])
1373 || s{G<([^>|]*)\|([^>]*)>}{ 1656 <
1374 $self->gender ? $2 : $1 1657 (?:
1658 ([^<>]*) (?{ $group = $^N })
1659 | < $interior >
1660 )
1661 >
1662 %gcsx
1663 ) {
1664 my ($code, $data) = ($1, $group);
1665
1666 if ($code eq "B") {
1667 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1668 } elsif ($code eq "I") {
1669 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1670 } elsif ($code eq "U") {
1671 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1672 } elsif ($code eq "C") {
1673 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1674 } elsif ($code eq "T") {
1675 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1676 } elsif ($code eq "G") {
1677 my ($male, $female) = split /\|/, $data;
1678 $data = $self->gender ? $female : $male;
1679 $xml .= expand_cfpod ($self, $data);
1680 } elsif ($code eq "H") {
1681 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1682 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1683 "")
1684 [$self->{hintmode}];
1685 } else {
1686 $xml .= "error processing '$code($data)' directive";
1687 }
1688 } else {
1689 if ($pod =~ /\G(.+)/) {
1690 warn "parse error while expanding $pod (at $1)";
1691 }
1692 last;
1375 }ge 1693 }
1376 # replace H<hint text> 1694 }
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1378 1695
1696 for ($xml) {
1379 # create single paragraphs (very hackish) 1697 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g; 1698 s/(?<=\S)\n(?=\w)/ /g;
1381 1699
1382 $_ 1700 # compress some whitespace
1383} 1701 s/\s+\n/\n/g; # ws line-ends
1702 s/\n\n+/\n/g; # double lines
1703 s/^\n+//; # beginning lines
1704 s/\n+$//; # ending lines
1705 }
1384 1706
1707 $xml
1708}
1709
1710no re 'eval';
1711
1712sub hintmode {
1713 $_[0]{hintmode} = $_[1] if @_ > 1;
1714 $_[0]{hintmode}
1715}
1716
1385=item $player->ext_reply ($msgid, %msg) 1717=item $player->ext_reply ($msgid, @msg)
1386 1718
1387Sends an ext reply to the player. 1719Sends an ext reply to the player.
1388 1720
1389=cut 1721=cut
1390 1722
1391sub ext_reply($$%) { 1723sub ext_reply($$@) {
1392 my ($self, $id, %msg) = @_; 1724 my ($self, $id, @msg) = @_;
1393 1725
1394 $msg{msgid} = $id; 1726 $self->ns->ext_reply ($id, @msg)
1395
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1727}
1398 1728
1399=item $player->ext_event ($type, %msg) 1729=item $player->ext_msg ($type, @msg)
1400 1730
1401Sends an ext event to the client. 1731Sends an ext event to the client.
1402 1732
1403=cut 1733=cut
1404 1734
1405sub ext_event($$%) { 1735sub ext_msg($$@) {
1406 my ($self, $type, %msg) = @_; 1736 my ($self, $type, @msg) = @_;
1407 1737
1408 $self->ns->ext_event ($type, %msg); 1738 $self->ns->ext_msg ($type, @msg);
1409} 1739}
1410 1740
1411=head3 cf::region 1741=head3 cf::region
1412 1742
1413=over 4 1743=over 4
1426 my ($path) = @_; 1756 my ($path) = @_;
1427 1757
1428 my ($match, $specificity); 1758 my ($match, $specificity);
1429 1759
1430 for my $region (list) { 1760 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1761 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1762 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1763 if $region->specificity > $specificity;
1434 } 1764 }
1435 } 1765 }
1436 1766
1457our $MAX_RESET = 3600; 1787our $MAX_RESET = 3600;
1458our $DEFAULT_RESET = 3000; 1788our $DEFAULT_RESET = 3000;
1459 1789
1460sub generate_random_map { 1790sub generate_random_map {
1461 my ($self, $rmp) = @_; 1791 my ($self, $rmp) = @_;
1792
1793 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1794
1462 # mit "rum" bekleckern, nicht 1795 # mit "rum" bekleckern, nicht
1463 $self->_create_random_map ( 1796 $self->_create_random_map (
1464 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1797 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1465 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1798 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1466 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1799 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1556 $self->init; # pass $1 etc. 1889 $self->init; # pass $1 etc.
1557 return $self; 1890 return $self;
1558 } 1891 }
1559 } 1892 }
1560 1893
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 1894 Carp::cluck "unable to resolve path '$path' (base '$base').";
1562 () 1895 ()
1563} 1896}
1564 1897
1565sub init { 1898sub init {
1566 my ($self) = @_; 1899 my ($self) = @_;
1588 1921
1589# the temporary/swap location 1922# the temporary/swap location
1590sub save_path { 1923sub save_path {
1591 my ($self) = @_; 1924 my ($self) = @_;
1592 1925
1593 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1594 "$TMPDIR/$path.map" 1927 "$TMPDIR/$path.map"
1595} 1928}
1596 1929
1597# the unique path, undef == no special unique path 1930# the unique path, undef == no special unique path
1598sub uniq_path { 1931sub uniq_path {
1599 my ($self) = @_; 1932 my ($self) = @_;
1600 1933
1601 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1602 "$UNIQUEDIR/$path" 1935 "$UNIQUEDIR/$path"
1603} 1936}
1604 1937
1605# and all this just because we cannot iterate over 1938# and all this just because we cannot iterate over
1606# all maps in C++... 1939# all maps in C++...
1629 1962
1630sub load_header_from($) { 1963sub load_header_from($) {
1631 my ($self, $path) = @_; 1964 my ($self, $path) = @_;
1632 1965
1633 utf8::encode $path; 1966 utf8::encode $path;
1634 #aio_open $path, O_RDONLY, 0 1967 my $f = new_from_file cf::object::thawer $path
1635 # or return;
1636
1637 $self->_load_header ($path)
1638 or return; 1968 or return;
1969
1970 $self->_load_header ($f)
1971 or return;
1972
1973 local $MAP_LOADING{$self->{path}} = $self;
1974 $f->resolve_delayed_derefs;
1639 1975
1640 $self->{load_path} = $path; 1976 $self->{load_path} = $path;
1641 1977
1642 1 1978 1
1643} 1979}
1697sub find { 2033sub find {
1698 my ($path, $origin) = @_; 2034 my ($path, $origin) = @_;
1699 2035
1700 $path = normalise $path, $origin && $origin->path; 2036 $path = normalise $path, $origin && $origin->path;
1701 2037
2038 cf::lock_wait "map_data:$path";#d#remove
1702 cf::lock_wait "map_find:$path"; 2039 cf::lock_wait "map_find:$path";
1703 2040
1704 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1705 my $guard = cf::lock_acquire "map_find:$path"; 2043 my $guard2 = cf::lock_acquire "map_find:$path";
2044
1706 my $map = new_from_path cf::map $path 2045 my $map = new_from_path cf::map $path
1707 or return; 2046 or return;
1708 2047
1709 $map->{last_save} = $cf::RUNTIME; 2048 $map->{last_save} = $cf::RUNTIME;
1710 2049
1712 or return; 2051 or return;
1713 2052
1714 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2053 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715 # doing this can freeze the server in a sync job, obviously 2054 # doing this can freeze the server in a sync job, obviously
1716 #$cf::WAIT_FOR_TICK->wait; 2055 #$cf::WAIT_FOR_TICK->wait;
2056 undef $guard2;
2057 undef $guard1;
1717 $map->reset; 2058 $map->reset;
1718 undef $guard;
1719 return find $path; 2059 return find $path;
1720 } 2060 }
1721 2061
1722 $cf::MAP{$path} = $map 2062 $cf::MAP{$path} = $map
1723 } 2063 }
1732 local $self->{deny_reset} = 1; # loading can take a long time 2072 local $self->{deny_reset} = 1; # loading can take a long time
1733 2073
1734 my $path = $self->{path}; 2074 my $path = $self->{path};
1735 2075
1736 { 2076 {
1737 my $guard = cf::lock_acquire "map_load:$path"; 2077 my $guard = cf::lock_acquire "map_data:$path";
1738 2078
2079 return unless $self->valid;
1739 return if $self->in_memory != cf::MAP_SWAPPED; 2080 return unless $self->in_memory == cf::MAP_SWAPPED;
1740 2081
1741 $self->in_memory (cf::MAP_LOADING); 2082 $self->in_memory (cf::MAP_LOADING);
1742 2083
1743 $self->alloc; 2084 $self->alloc;
1744 2085
1745 $self->pre_load; 2086 $self->pre_load;
1746 Coro::cede; 2087 cf::cede_to_tick;
1747 2088
2089 my $f = new_from_file cf::object::thawer $self->{load_path};
2090 $f->skip_block;
1748 $self->_load_objects ($self->{load_path}, 1) 2091 $self->_load_objects ($f)
1749 or return; 2092 or return;
1750 2093
1751 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2094 $self->post_load_original
1752 if delete $self->{load_original}; 2095 if delete $self->{load_original};
1753 2096
1754 if (my $uniq = $self->uniq_path) { 2097 if (my $uniq = $self->uniq_path) {
1755 utf8::encode $uniq; 2098 utf8::encode $uniq;
1756 if (aio_open $uniq, O_RDONLY, 0) { 2099 unless (aio_stat $uniq) {
2100 if (my $f = new_from_file cf::object::thawer $uniq) {
1757 $self->clear_unique_items; 2101 $self->clear_unique_items;
1758 $self->_load_objects ($uniq, 0); 2102 $self->_load_objects ($f);
2103 $f->resolve_delayed_derefs;
2104 }
1759 } 2105 }
1760 } 2106 }
1761 2107
1762 Coro::cede; 2108 $f->resolve_delayed_derefs;
2109
2110 cf::cede_to_tick;
1763 # now do the right thing for maps 2111 # now do the right thing for maps
1764 $self->link_multipart_objects; 2112 $self->link_multipart_objects;
1765 $self->difficulty ($self->estimate_difficulty) 2113 $self->difficulty ($self->estimate_difficulty)
1766 unless $self->difficulty; 2114 unless $self->difficulty;
1767 Coro::cede; 2115 cf::cede_to_tick;
1768 2116
1769 unless ($self->{deny_activate}) { 2117 unless ($self->{deny_activate}) {
1770 $self->decay_objects; 2118 $self->decay_objects;
1771 $self->fix_auto_apply; 2119 $self->fix_auto_apply;
1772 $self->update_buttons; 2120 $self->update_buttons;
1773 Coro::cede; 2121 cf::cede_to_tick;
1774 $self->set_darkness_map; 2122 $self->set_darkness_map;
1775 Coro::cede; 2123 cf::cede_to_tick;
1776 $self->activate; 2124 $self->activate;
1777 } 2125 }
1778 2126
2127 $self->{last_save} = $cf::RUNTIME;
2128 $self->last_access ($cf::RUNTIME);
2129
1779 $self->in_memory (cf::MAP_IN_MEMORY); 2130 $self->in_memory (cf::MAP_ACTIVE);
1780 } 2131 }
1781 2132
1782 $self->post_load; 2133 $self->post_load;
1783} 2134}
1784 2135
1793 2144
1794 $self 2145 $self
1795} 2146}
1796 2147
1797# find and load all maps in the 3x3 area around a map 2148# find and load all maps in the 3x3 area around a map
1798sub load_diag { 2149sub load_neighbours {
1799 my ($map) = @_; 2150 my ($map) = @_;
1800 2151
1801 my @diag; # diagonal neighbours 2152 my @neigh; # diagonal neighbours
1802 2153
1803 for (0 .. 3) { 2154 for (0 .. 3) {
1804 my $neigh = $map->tile_path ($_) 2155 my $neigh = $map->tile_path ($_)
1805 or next; 2156 or next;
1806 $neigh = find $neigh, $map 2157 $neigh = find $neigh, $map
1807 or next; 2158 or next;
1808 $neigh->load; 2159 $neigh->load;
1809 2160
2161 push @neigh,
1810 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2162 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1811 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2163 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1812 } 2164 }
1813 2165
1814 for (@diag) { 2166 for (grep defined $_->[0], @neigh) {
2167 my ($path, $origin) = @$_;
1815 my $neigh = find @$_ 2168 my $neigh = find $path, $origin
1816 or next; 2169 or next;
1817 $neigh->load; 2170 $neigh->load;
1818 } 2171 }
1819} 2172}
1820 2173
1825} 2178}
1826 2179
1827sub do_load_sync { 2180sub do_load_sync {
1828 my ($map) = @_; 2181 my ($map) = @_;
1829 2182
2183 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2184 if $Coro::current == $Coro::main;
2185
1830 cf::sync_job { $map->load }; 2186 cf::sync_job { $map->load };
1831} 2187}
1832 2188
1833our %MAP_PREFETCH; 2189our %MAP_PREFETCH;
1834our $MAP_PREFETCHER = undef; 2190our $MAP_PREFETCHER = undef;
1835 2191
1836sub find_async { 2192sub find_async {
1837 my ($path, $origin) = @_; 2193 my ($path, $origin, $load) = @_;
1838 2194
1839 $path = normalise $path, $origin && $origin->{path}; 2195 $path = normalise $path, $origin && $origin->{path};
1840 2196
1841 if (my $map = $cf::MAP{$path}) { 2197 if (my $map = $cf::MAP{$path}) {
1842 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2198 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1843 } 2199 }
1844 2200
1845 undef $MAP_PREFETCH{$path}; 2201 $MAP_PREFETCH{$path} |= $load;
2202
1846 $MAP_PREFETCHER ||= cf::async { 2203 $MAP_PREFETCHER ||= cf::async {
2204 $Coro::current->{desc} = "map prefetcher";
2205
1847 while (%MAP_PREFETCH) { 2206 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 2207 while (my ($k, $v) = each %MAP_PREFETCH) {
1849 my $map = find $path 2208 if (my $map = find $k) {
1850 or next;
1851 $map->load; 2209 $map->load if $v;
2210 }
1852 2211
1853 delete $MAP_PREFETCH{$path}; 2212 delete $MAP_PREFETCH{$k};
1854 } 2213 }
1855 } 2214 }
1856 undef $MAP_PREFETCHER; 2215 undef $MAP_PREFETCHER;
1857 }; 2216 };
1858 $MAP_PREFETCHER->prio (6); 2217 $MAP_PREFETCHER->prio (6);
1861} 2220}
1862 2221
1863sub save { 2222sub save {
1864 my ($self) = @_; 2223 my ($self) = @_;
1865 2224
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2225 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2226
1868 $self->{last_save} = $cf::RUNTIME; 2227 $self->{last_save} = $cf::RUNTIME;
1869 2228
1870 return unless $self->dirty; 2229 return unless $self->dirty;
1871 2230
1877 return if $self->{deny_save}; 2236 return if $self->{deny_save};
1878 2237
1879 local $self->{last_access} = $self->last_access;#d# 2238 local $self->{last_access} = $self->last_access;#d#
1880 2239
1881 cf::async { 2240 cf::async {
2241 $Coro::current->{desc} = "map player save";
1882 $_->contr->save for $self->players; 2242 $_->contr->save for $self->players;
1883 }; 2243 };
2244
2245 cf::get_slot 0.02;
1884 2246
1885 if ($uniq) { 2247 if ($uniq) {
1886 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1887 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2249 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1888 } else { 2250 } else {
1894 my ($self) = @_; 2256 my ($self) = @_;
1895 2257
1896 # save first because save cedes 2258 # save first because save cedes
1897 $self->save; 2259 $self->save;
1898 2260
1899 my $lock = cf::lock_acquire "map_data:" . $self->path; 2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
1900 2262
1901 return if $self->players; 2263 return if $self->players;
1902 return if $self->in_memory != cf::MAP_IN_MEMORY; 2264 return if $self->in_memory != cf::MAP_ACTIVE;
1903 return if $self->{deny_save}; 2265 return if $self->{deny_save};
1904 2266
2267 $self->in_memory (cf::MAP_SWAPPED);
2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
1905 $self->clear; 2271 $self->clear;
1906 $self->in_memory (cf::MAP_SWAPPED);
1907} 2272}
1908 2273
1909sub reset_at { 2274sub reset_at {
1910 my ($self) = @_; 2275 my ($self) = @_;
1911 2276
1943 if $uniq; 2308 if $uniq;
1944 } 2309 }
1945 2310
1946 delete $cf::MAP{$self->path}; 2311 delete $cf::MAP{$self->path};
1947 2312
2313 $self->deactivate;
2314 $_->clear_links_to ($self) for values %cf::MAP;
1948 $self->clear; 2315 $self->clear;
1949
1950 $_->clear_links_to ($self) for values %cf::MAP;
1951 2316
1952 $self->unlink_save; 2317 $self->unlink_save;
1953 $self->destroy; 2318 $self->destroy;
1954} 2319}
1955 2320
1956my $nuke_counter = "aaaa"; 2321my $nuke_counter = "aaaa";
1957 2322
1958sub nuke { 2323sub nuke {
1959 my ($self) = @_; 2324 my ($self) = @_;
1960 2325
2326 {
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
1961 delete $cf::MAP{$self->path}; 2329 delete $cf::MAP{$self->path};
1962 2330
1963 $self->unlink_save; 2331 $self->unlink_save;
1964 2332
1965 bless $self, "cf::map"; 2333 bless $self, "cf::map";
1966 delete $self->{deny_reset}; 2334 delete $self->{deny_reset};
1967 $self->{deny_save} = 1; 2335 $self->{deny_save} = 1;
1968 $self->reset_timeout (1); 2336 $self->reset_timeout (1);
1969 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2337 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970 2338
1971 $cf::MAP{$self->path} = $self; 2339 $cf::MAP{$self->path} = $self;
2340 }
1972 2341
1973 $self->reset; # polite request, might not happen 2342 $self->reset; # polite request, might not happen
1974} 2343}
1975 2344
1976=item $maps = cf::map::tmp_maps 2345=item $maps = cf::map::tmp_maps
2018 2387
2019sub unique_maps() { 2388sub unique_maps() {
2020 [ 2389 [
2021 map { 2390 map {
2022 utf8::decode $_; 2391 utf8::decode $_;
2023 /\.map$/ 2392 s/\.map$//; # TODO future compatibility hack
2393 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2394 ? ()
2024 ? normalise $_ 2395 : normalise $_
2025 : ()
2026 } @{ aio_readdir $UNIQUEDIR or [] } 2396 } @{ aio_readdir $UNIQUEDIR or [] }
2027 ] 2397 ]
2028} 2398}
2029 2399
2030package cf;
2031
2032=back 2400=back
2033 2401
2034=head3 cf::object 2402=head3 cf::object
2035 2403
2036=cut 2404=cut
2039 2407
2040=over 4 2408=over 4
2041 2409
2042=item $ob->inv_recursive 2410=item $ob->inv_recursive
2043 2411
2044Returns the inventory of the object _and_ their inventories, recursively. 2412Returns the inventory of the object I<and> their inventories, recursively,
2413but I<not> the object itself.
2045 2414
2046=cut 2415=cut
2047 2416
2048sub inv_recursive_; 2417sub inv_recursive_;
2049sub inv_recursive_ { 2418sub inv_recursive_ {
2052 2421
2053sub inv_recursive { 2422sub inv_recursive {
2054 inv_recursive_ inv $_[0] 2423 inv_recursive_ inv $_[0]
2055} 2424}
2056 2425
2426=item $ref = $ob->ref
2427
2428Creates and returns a persistent reference to an object that can be stored as a string.
2429
2430=item $ob = cf::object::deref ($refstring)
2431
2432returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2433even if the object actually exists. May block.
2434
2435=cut
2436
2437sub deref {
2438 my ($ref) = @_;
2439
2440 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2441 my ($uuid, $name) = ($1, $2);
2442 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2443 or return;
2444 $pl->ob->uuid eq $uuid
2445 or return;
2446
2447 $pl->ob
2448 } else {
2449 warn "$ref: cannot resolve object reference\n";
2450 undef
2451 }
2452}
2453
2057package cf; 2454package cf;
2058 2455
2059=back 2456=back
2060 2457
2061=head3 cf::object::player 2458=head3 cf::object::player
2067Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2464Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2068can be C<undef>. Does the right thing when the player is currently in a 2465can be C<undef>. Does the right thing when the player is currently in a
2069dialogue with the given NPC character. 2466dialogue with the given NPC character.
2070 2467
2071=cut 2468=cut
2469
2470our $SAY_CHANNEL = {
2471 id => "say",
2472 title => "Map",
2473 reply => "say ",
2474 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2475};
2476
2477our $CHAT_CHANNEL = {
2478 id => "chat",
2479 title => "Chat",
2480 reply => "chat ",
2481 tooltip => "Player chat and shouts, global to the server.",
2482};
2072 2483
2073# rough implementation of a future "reply" method that works 2484# rough implementation of a future "reply" method that works
2074# with dialog boxes. 2485# with dialog boxes.
2075#TODO: the first argument must go, split into a $npc->reply_to ( method 2486#TODO: the first argument must go, split into a $npc->reply_to ( method
2076sub cf::object::player::reply($$$;$) { 2487sub cf::object::player::reply($$$;$) {
2083 2494
2084 } else { 2495 } else {
2085 my $pl = $self->contr; 2496 my $pl = $self->contr;
2086 2497
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2498 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog}; 2499 my $dialog = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply ( 2500 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090 $diag->{id},
2091 msgtype => "reply",
2092 msg => $diag->{pl}->expand_cfpod ($msg),
2093 add_topics => []
2094 );
2095 2501
2096 } else { 2502 } else {
2097 $msg = $npc->name . " says: $msg" if $npc; 2503 $msg = $npc->name . " says: $msg" if $npc;
2098 $self->message ($msg, $flags); 2504 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2099 } 2505 }
2100 } 2506 }
2507}
2508
2509=item $object->send_msg ($channel, $msg, $color, [extra...])
2510
2511=cut
2512
2513sub cf::object::send_msg {
2514 my $pl = shift->contr
2515 or return;
2516 $pl->send_msg (@_);
2101} 2517}
2102 2518
2103=item $player_object->may ("access") 2519=item $player_object->may ("access")
2104 2520
2105Returns wether the given player is authorized to access resource "access" 2521Returns wether the given player is authorized to access resource "access"
2184 # use -1 or undef as default coordinates, not 0, 0 2600 # use -1 or undef as default coordinates, not 0, 0
2185 ($x, $y) = ($map->enter_x, $map->enter_y) 2601 ($x, $y) = ($map->enter_x, $map->enter_y)
2186 if $x <=0 && $y <= 0; 2602 if $x <=0 && $y <= 0;
2187 2603
2188 $map->load; 2604 $map->load;
2189 $map->load_diag; 2605 $map->load_neighbours;
2190 2606
2191 return unless $self->contr->active; 2607 return unless $self->contr->active;
2192 $self->activate_recursive; 2608 $self->activate_recursive;
2193 2609
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2610 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2611 $self->enter_map ($map, $x, $y);
2196} 2612}
2197 2613
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2614=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199 2615
2200Moves the player to the given map-path and coordinates by first freezing 2616Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback 2617her, loading and preparing them map, calling the provided $check callback
2202that has to return the map if sucecssful, and then unfreezes the player on 2618that has to return the map if sucecssful, and then unfreezes the player on
2203the new (success) or old (failed) map position. 2619the new (success) or old (failed) map position. In either case, $done will
2620be called at the end of this process.
2621
2622Note that $check will be called with a potentially non-loaded map, so if
2623it needs a loaded map it has to call C<< ->load >>.
2204 2624
2205=cut 2625=cut
2206 2626
2207our $GOTOGEN; 2627our $GOTOGEN;
2208 2628
2209sub cf::object::player::goto { 2629sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2630 my ($self, $path, $x, $y, $check, $done) = @_;
2211 2631
2212 # do generation counting so two concurrent goto's will be executed in-order 2632 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2633 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2634
2215 $self->enter_link; 2635 $self->enter_link;
2216 2636
2217 (async { 2637 (async {
2638 $Coro::current->{desc} = "player::goto $path $x $y";
2639
2640 # *tag paths override both path and x|y
2641 if ($path =~ /^\*(.*)$/) {
2642 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2643 my $ob = $obs[rand @obs];
2644
2645 # see if we actually can go there
2646 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2647 $ob = $obs[rand @obs];
2648 } else {
2649 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2650 }
2651 # else put us there anyways for now #d#
2652
2653 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2654 } else {
2655 ($path, $x, $y) = (undef, undef, undef);
2656 }
2657 }
2658
2218 my $map = eval { 2659 my $map = eval {
2219 my $map = cf::map::find $path; 2660 my $map = defined $path ? cf::map::find $path : undef;
2220 2661
2221 if ($map) { 2662 if ($map) {
2222 $map = $map->customise_for ($self); 2663 $map = $map->customise_for ($self);
2223 $map = $check->($map) if $check && $map; 2664 $map = $check->($map) if $check && $map;
2224 } else { 2665 } else {
2225 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2666 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2226 } 2667 }
2227 2668
2228 $map 2669 $map
2229 }; 2670 };
2230 2671
2235 2676
2236 if ($gen == $self->{_goto_generation}) { 2677 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2678 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2679 $self->leave_link ($map, $x, $y);
2239 } 2680 }
2681
2682 $done->() if $done;
2240 })->prio (1); 2683 })->prio (1);
2241} 2684}
2242 2685
2243=item $player_object->enter_exit ($exit_object) 2686=item $player_object->enter_exit ($exit_object)
2244 2687
2264} 2707}
2265 2708
2266sub prepare_random_map { 2709sub prepare_random_map {
2267 my ($exit) = @_; 2710 my ($exit) = @_;
2268 2711
2269 my $guard = cf::lock_acquire "exit_prepare:$exit";
2270
2271 # all this does is basically replace the /! path by 2712 # all this does is basically replace the /! path by
2272 # a new random map path (?random/...) with a seed 2713 # a new random map path (?random/...) with a seed
2273 # that depends on the exit object 2714 # that depends on the exit object
2274 2715
2275 my $rmp = parse_random_map_params $exit->msg; 2716 my $rmp = parse_random_map_params $exit->msg;
2277 if ($exit->map) { 2718 if ($exit->map) {
2278 $rmp->{region} = $exit->region->name; 2719 $rmp->{region} = $exit->region->name;
2279 $rmp->{origin_map} = $exit->map->path; 2720 $rmp->{origin_map} = $exit->map->path;
2280 $rmp->{origin_x} = $exit->x; 2721 $rmp->{origin_x} = $exit->x;
2281 $rmp->{origin_y} = $exit->y; 2722 $rmp->{origin_y} = $exit->y;
2723
2724 $exit->map->touch;
2282 } 2725 }
2283 2726
2284 $rmp->{random_seed} ||= $exit->random_seed; 2727 $rmp->{random_seed} ||= $exit->random_seed;
2285 2728
2286 my $data = cf::to_json $rmp; 2729 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2287 my $md5 = Digest::MD5::md5_hex $data; 2730 my $md5 = Digest::MD5::md5_hex $data;
2288 my $meta = "$RANDOMDIR/$md5.meta"; 2731 my $meta = "$RANDOMDIR/$md5.meta";
2289 2732
2290 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2733 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2291 aio_write $fh, 0, (length $data), $data, 0; 2734 aio_write $fh, 0, (length $data), $data, 0;
2292 undef $fh; 2735 undef $fh;
2293 aio_rename "$meta~", $meta; 2736 aio_rename "$meta~", $meta;
2294 2737
2738 my $slaying = "?random/$md5";
2739
2740 if ($exit->valid) {
2295 $exit->slaying ("?random/$md5"); 2741 $exit->slaying ("?random/$md5");
2296 $exit->msg (undef); 2742 $exit->msg (undef);
2743 }
2297 } 2744 }
2298} 2745}
2299 2746
2300sub cf::object::player::enter_exit { 2747sub cf::object::player::enter_exit {
2301 my ($self, $exit) = @_; 2748 my ($self, $exit) = @_;
2302 2749
2303 return unless $self->type == cf::PLAYER; 2750 return unless $self->type == cf::PLAYER;
2304 2751
2305 if ($exit->slaying eq "/!") {
2306 #TODO: this should de-fi-ni-te-ly not be a sync-job
2307 # the problem is that $exit might not survive long enough
2308 # so it needs to be done right now, right here
2309 cf::sync_job { prepare_random_map $exit };
2310 }
2311
2312 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2313 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp;
2315
2316 $self->enter_link; 2752 $self->enter_link;
2317 2753
2318 (async { 2754 (async {
2319 $self->deactivate_recursive; # just to be sure 2755 $Coro::current->{desc} = "enter_exit";
2756
2320 unless (eval { 2757 unless (eval {
2758 $self->deactivate_recursive; # just to be sure
2759
2760 # random map handling
2761 {
2762 my $guard = cf::lock_acquire "exit_prepare:$exit";
2763
2764 prepare_random_map $exit
2765 if $exit->slaying eq "/!";
2766 }
2767
2768 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2769 my $x = $exit->stats->hp;
2770 my $y = $exit->stats->sp;
2771
2321 $self->goto ($slaying, $hp, $sp); 2772 $self->goto ($map, $x, $y);
2322 2773
2774 # if exit is damned, update players death & WoR home-position
2775 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED);
2777
2323 1; 2778 1
2324 }) { 2779 }) {
2325 $self->message ("Something went wrong deep within the crossfire server. " 2780 $self->message ("Something went wrong deep within the crossfire server. "
2326 . "I'll try to bring you back to the map you were before. " 2781 . "I'll try to bring you back to the map you were before. "
2327 . "Please report this to the dungeon master!", 2782 . "Please report this to the dungeon master!",
2328 cf::NDI_UNIQUE | cf::NDI_RED); 2783 cf::NDI_UNIQUE | cf::NDI_RED);
2349 2804
2350 utf8::encode $text; 2805 utf8::encode $text;
2351 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2806 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352} 2807}
2353 2808
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 2809=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 2810
2356Send a drawinfo or msg packet to the client, formatting the msg for the 2811Send a drawinfo or msg packet to the client, formatting the msg for the
2357client if neccessary. C<$type> should be a string identifying the type of 2812client if neccessary. C<$type> should be a string identifying the type of
2358the message, with C<log> being the default. If C<$color> is negative, suppress 2813the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet. 2814the message unless the client supports the msg packet.
2360 2815
2361=cut 2816=cut
2362 2817
2818# non-persistent channels (usually the info channel)
2819our %CHANNEL = (
2820 "c/identify" => {
2821 id => "infobox",
2822 title => "Identify",
2823 reply => undef,
2824 tooltip => "Items recently identified",
2825 },
2826 "c/examine" => {
2827 id => "infobox",
2828 title => "Examine",
2829 reply => undef,
2830 tooltip => "Signs and other items you examined",
2831 },
2832 "c/book" => {
2833 id => "infobox",
2834 title => "Book",
2835 reply => undef,
2836 tooltip => "The contents of a note or book",
2837 },
2838 "c/lookat" => {
2839 id => "infobox",
2840 title => "Look",
2841 reply => undef,
2842 tooltip => "What you saw there",
2843 },
2844 "c/who" => {
2845 id => "infobox",
2846 title => "Players",
2847 reply => undef,
2848 tooltip => "Shows players who are currently online",
2849 },
2850 "c/body" => {
2851 id => "infobox",
2852 title => "Body Parts",
2853 reply => undef,
2854 tooltip => "Shows which body parts you posess and are available",
2855 },
2856 "c/uptime" => {
2857 id => "infobox",
2858 title => "Uptime",
2859 reply => undef,
2860 tooltip => "How long the server has been running since last restart",
2861 },
2862 "c/mapinfo" => {
2863 id => "infobox",
2864 title => "Map Info",
2865 reply => undef,
2866 tooltip => "Information related to the maps",
2867 },
2868 "c/party" => {
2869 id => "party",
2870 title => "Party",
2871 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party",
2873 },
2874);
2875
2363sub cf::client::send_msg { 2876sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2877 my ($self, $channel, $msg, $color, @extra) = @_;
2365 2878
2366 $msg = $self->pl->expand_cfpod ($msg); 2879 $msg = $self->pl->expand_cfpod ($msg);
2367 2880
2881 $color &= cf::NDI_CLIENT_MASK; # just in case...
2882
2883 # check predefined channels, for the benefit of C
2884 if ($CHANNEL{$channel}) {
2885 $channel = $CHANNEL{$channel};
2886
2887 $self->ext_msg (channel_info => $channel)
2888 if $self->can_msg;
2889
2890 $channel = $channel->{id};
2891
2892 } elsif (ref $channel) {
2893 # send meta info to client, if not yet sent
2894 unless (exists $self->{channel}{$channel->{id}}) {
2895 $self->{channel}{$channel->{id}} = $channel;
2896 $self->ext_msg (channel_info => $channel)
2897 if $self->can_msg;
2898 }
2899
2900 $channel = $channel->{id};
2901 }
2902
2903 return unless @extra || length $msg;
2904
2368 if ($self->can_msg) { 2905 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2906 # default colour, mask it out
2907 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2908 if $color & cf::NDI_DEF;
2909
2910 $self->send_packet ("msg " . $self->{json_coder}->encode (
2911 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2370 } else { 2912 } else {
2371 # replace some tags by gcfclient-compatible ones
2372 for ($msg) {
2373 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/;
2379 }
2380
2381 if ($color >= 0) { 2913 if ($color >= 0) {
2914 # replace some tags by gcfclient-compatible ones
2915 for ($msg) {
2916 1 while
2917 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2918 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2919 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2920 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2921 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2922 }
2923
2924 $color &= cf::NDI_COLOR_MASK;
2925
2926 utf8::encode $msg;
2927
2382 if ($msg =~ /\[/) { 2928 if (0 && $msg =~ /\[/) {
2929 # COMMAND/INFO
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2930 $self->send_packet ("drawextinfo $color 10 8 $msg")
2384 } else { 2931 } else {
2932 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2385 $self->send_packet ("drawinfo $color $msg") 2933 $self->send_packet ("drawinfo $color $msg")
2386 } 2934 }
2387 } 2935 }
2388 } 2936 }
2389} 2937}
2390 2938
2391=item $client->ext_event ($type, %msg) 2939=item $client->ext_msg ($type, @msg)
2392 2940
2393Sends an exti event to the client. 2941Sends an ext event to the client.
2394 2942
2395=cut 2943=cut
2396 2944
2397sub cf::client::ext_event($$%) { 2945sub cf::client::ext_msg($$@) {
2398 my ($self, $type, %msg) = @_; 2946 my ($self, $type, @msg) = @_;
2399 2947
2948 if ($self->extcmd == 2) {
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2950 } elsif ($self->extcmd == 1) { # TODO: remove
2400 $msg{msgtype} = "event_$type"; 2951 push @msg, msgtype => "event_$type";
2401 $self->send_packet ("ext " . cf::to_json \%msg); 2952 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2953 }
2954}
2955
2956=item $client->ext_reply ($msgid, @msg)
2957
2958Sends an ext reply to the client.
2959
2960=cut
2961
2962sub cf::client::ext_reply($$@) {
2963 my ($self, $id, @msg) = @_;
2964
2965 if ($self->extcmd == 2) {
2966 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2967 } elsif ($self->extcmd == 1) {
2968 #TODO: version 1, remove
2969 unshift @msg, msgtype => "reply", msgid => $id;
2970 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2971 }
2402} 2972}
2403 2973
2404=item $success = $client->query ($flags, "text", \&cb) 2974=item $success = $client->query ($flags, "text", \&cb)
2405 2975
2406Queues a query to the client, calling the given callback with 2976Queues a query to the client, calling the given callback with
2407the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2977the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2408C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2978C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2409 2979
2410Queries can fail, so check the return code. Or don't, as queries will become 2980Queries can fail, so check the return code. Or don't, as queries will
2411reliable at some point in the future. 2981become reliable at some point in the future.
2412 2982
2413=cut 2983=cut
2414 2984
2415sub cf::client::query { 2985sub cf::client::query {
2416 my ($self, $flags, $text, $cb) = @_; 2986 my ($self, $flags, $text, $cb) = @_;
2424 utf8::encode $text; 2994 utf8::encode $text;
2425 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2995 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2426 2996
2427 $self->send_packet ($self->{query_queue}[0][0]) 2997 $self->send_packet ($self->{query_queue}[0][0])
2428 if @{ $self->{query_queue} } == 1; 2998 if @{ $self->{query_queue} } == 1;
2999
3000 1
2429} 3001}
2430 3002
2431cf::client->attach ( 3003cf::client->attach (
3004 on_connect => sub {
3005 my ($ns) = @_;
3006
3007 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3008 },
2432 on_reply => sub { 3009 on_reply => sub {
2433 my ($ns, $msg) = @_; 3010 my ($ns, $msg) = @_;
2434 3011
2435 # this weird shuffling is so that direct followup queries 3012 # this weird shuffling is so that direct followup queries
2436 # get handled first 3013 # get handled first
2448 } else { 3025 } else {
2449 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3026 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2450 } 3027 }
2451 } 3028 }
2452 }, 3029 },
3030 on_exticmd => sub {
3031 my ($ns, $buf) = @_;
3032
3033 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3034
3035 if (ref $msg) {
3036 my ($type, $reply, @payload) =
3037 "ARRAY" eq ref $msg
3038 ? @$msg
3039 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3040
3041 my @reply;
3042
3043 if (my $cb = $EXTICMD{$type}) {
3044 @reply = $cb->($ns, @payload);
3045 }
3046
3047 $ns->ext_reply ($reply, @reply)
3048 if $reply;
3049
3050 } else {
3051 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3052 }
3053
3054 cf::override;
3055 },
2453); 3056);
2454 3057
2455=item $client->async (\&cb) 3058=item $client->async (\&cb)
2456 3059
2457Create a new coroutine, running the specified callback. The coroutine will 3060Create a new coroutine, running the specified callback. The coroutine will
2498our $safe = new Safe "safe"; 3101our $safe = new Safe "safe";
2499our $safe_hole = new Safe::Hole; 3102our $safe_hole = new Safe::Hole;
2500 3103
2501$SIG{FPE} = 'IGNORE'; 3104$SIG{FPE} = 'IGNORE';
2502 3105
2503$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3106$safe->permit_only (Opcode::opset qw(
3107 :base_core :base_mem :base_orig :base_math
3108 grepstart grepwhile mapstart mapwhile
3109 sort time
3110));
2504 3111
2505# here we export the classes and methods available to script code 3112# here we export the classes and methods available to script code
2506 3113
2507=pod 3114=pod
2508 3115
2509The following functions and methods are available within a safe environment: 3116The following functions and methods are available within a safe environment:
2510 3117
2511 cf::object contr pay_amount pay_player map 3118 cf::object
3119 contr pay_amount pay_player map x y force_find force_add destroy
3120 insert remove name archname title slaying race decrease split
3121
2512 cf::object::player player 3122 cf::object::player
2513 cf::player peaceful 3123 player
2514 cf::map trigger 3124
3125 cf::player
3126 peaceful
3127
3128 cf::map
3129 trigger
2515 3130
2516=cut 3131=cut
2517 3132
2518for ( 3133for (
2519 ["cf::object" => qw(contr pay_amount pay_player map)], 3134 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3135 insert remove inv nrof name archname title slaying race
3136 decrease split destroy change_exp)],
2520 ["cf::object::player" => qw(player)], 3137 ["cf::object::player" => qw(player)],
2521 ["cf::player" => qw(peaceful)], 3138 ["cf::player" => qw(peaceful)],
2522 ["cf::map" => qw(trigger)], 3139 ["cf::map" => qw(trigger)],
2523) { 3140) {
2524 no strict 'refs'; 3141 no strict 'refs';
2600# the server's init and main functions 3217# the server's init and main functions
2601 3218
2602sub load_facedata($) { 3219sub load_facedata($) {
2603 my ($path) = @_; 3220 my ($path) = @_;
2604 3221
3222 # HACK to clear player env face cache, we need some signal framework
3223 # for this (global event?)
3224 %ext::player_env::MUSIC_FACE_CACHE = ();
3225
3226 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3227
2605 warn "loading facedata from $path\n"; 3228 warn "loading facedata from $path\n";
2606 3229
2607 my $facedata; 3230 my $facedata;
2608 0 < aio_load $path, $facedata 3231 0 < aio_load $path, $facedata
2609 or die "$path: $!"; 3232 or die "$path: $!";
2611 $facedata = Coro::Storable::thaw $facedata; 3234 $facedata = Coro::Storable::thaw $facedata;
2612 3235
2613 $facedata->{version} == 2 3236 $facedata->{version} == 2
2614 or cf::cleanup "$path: version mismatch, cannot proceed."; 3237 or cf::cleanup "$path: version mismatch, cannot proceed.";
2615 3238
3239 # patch in the exptable
3240 $facedata->{resource}{"res/exp_table"} = {
3241 type => FT_RSRC,
3242 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3243 };
3244 cf::cede_to_tick;
3245
2616 { 3246 {
2617 my $faces = $facedata->{faceinfo}; 3247 my $faces = $facedata->{faceinfo};
2618 3248
2619 while (my ($face, $info) = each %$faces) { 3249 while (my ($face, $info) = each %$faces) {
2620 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3250 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3251
2621 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3252 cf::face::set_visibility $idx, $info->{visibility};
3253 cf::face::set_magicmap $idx, $info->{magicmap};
2622 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3254 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2623 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3255 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2624 Coro::cede; 3256
3257 cf::cede_to_tick;
2625 } 3258 }
2626 3259
2627 while (my ($face, $info) = each %$faces) { 3260 while (my ($face, $info) = each %$faces) {
2628 next unless $info->{smooth}; 3261 next unless $info->{smooth};
3262
2629 my $idx = cf::face::find $face 3263 my $idx = cf::face::find $face
2630 or next; 3264 or next;
3265
2631 if (my $smooth = cf::face::find $info->{smooth}) { 3266 if (my $smooth = cf::face::find $info->{smooth}) {
3267 cf::face::set_smooth $idx, $smooth;
2632 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3268 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2633 } else { 3269 } else {
2634 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3270 warn "smooth face '$info->{smooth}' not found for face '$face'";
2635 } 3271 }
2636 Coro::cede; 3272
3273 cf::cede_to_tick;
2637 } 3274 }
2638 } 3275 }
2639 3276
2640 { 3277 {
2641 my $anims = $facedata->{animinfo}; 3278 my $anims = $facedata->{animinfo};
2642 3279
2643 while (my ($anim, $info) = each %$anims) { 3280 while (my ($anim, $info) = each %$anims) {
2644 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3281 cf::anim::set $anim, $info->{frames}, $info->{facings};
2645 Coro::cede; 3282 cf::cede_to_tick;
2646 } 3283 }
2647 3284
2648 cf::anim::invalidate_all; # d'oh 3285 cf::anim::invalidate_all; # d'oh
2649 } 3286 }
2650 3287
3288 {
3289 # TODO: for gcfclient pleasure, we should give resources
3290 # that gcfclient doesn't grok a >10000 face index.
3291 my $res = $facedata->{resource};
3292
3293 while (my ($name, $info) = each %$res) {
3294 if (defined $info->{type}) {
3295 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3296 my $data;
3297
3298 if ($info->{type} & 1) {
3299 # prepend meta info
3300
3301 my $meta = $enc->encode ({
3302 name => $name,
3303 %{ $info->{meta} || {} },
3304 });
3305
3306 $data = pack "(w/a*)*", $meta, $info->{data};
3307 } else {
3308 $data = $info->{data};
3309 }
3310
3311 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3312 cf::face::set_type $idx, $info->{type};
3313 } else {
3314 $RESOURCE{$name} = $info;
3315 }
3316
3317 cf::cede_to_tick;
3318 }
3319 }
3320
3321 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3322
2651 1 3323 1
2652} 3324}
2653 3325
3326cf::global->attach (on_resource_update => sub {
3327 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3328 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3329
3330 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3331 my $sound = $soundconf->{compat}[$_]
3332 or next;
3333
3334 my $face = cf::face::find "sound/$sound->[1]";
3335 cf::sound::set $sound->[0] => $face;
3336 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3337 }
3338
3339 while (my ($k, $v) = each %{$soundconf->{event}}) {
3340 my $face = cf::face::find "sound/$v";
3341 cf::sound::set $k => $face;
3342 }
3343 }
3344});
3345
3346register_exticmd fx_want => sub {
3347 my ($ns, $want) = @_;
3348
3349 while (my ($k, $v) = each %$want) {
3350 $ns->fx_want ($k, $v);
3351 }
3352};
3353
3354sub load_resource_file($) {
3355 my $guard = lock_acquire "load_resource_file";
3356
3357 my $status = load_resource_file_ $_[0];
3358 get_slot 0.1, 100;
3359 cf::arch::commit_load;
3360
3361 $status
3362}
3363
2654sub reload_regions { 3364sub reload_regions {
3365 # HACK to clear player env face cache, we need some signal framework
3366 # for this (global event?)
3367 %ext::player_env::MUSIC_FACE_CACHE = ();
3368
2655 load_resource_file "$MAPDIR/regions" 3369 load_resource_file "$MAPDIR/regions"
2656 or die "unable to load regions file\n"; 3370 or die "unable to load regions file\n";
3371
3372 for (cf::region::list) {
3373 $_->{match} = qr/$_->{match}/
3374 if exists $_->{match};
3375 }
2657} 3376}
2658 3377
2659sub reload_facedata { 3378sub reload_facedata {
2660 load_facedata "$DATADIR/facedata" 3379 load_facedata "$DATADIR/facedata"
2661 or die "unable to load facedata\n"; 3380 or die "unable to load facedata\n";
2672} 3391}
2673 3392
2674sub reload_resources { 3393sub reload_resources {
2675 warn "reloading resource files...\n"; 3394 warn "reloading resource files...\n";
2676 3395
3396 reload_facedata;
3397 reload_archetypes;
2677 reload_regions; 3398 reload_regions;
2678 reload_facedata;
2679 #reload_archetypes;#d#
2680 reload_archetypes;
2681 reload_treasures; 3399 reload_treasures;
2682 3400
2683 warn "finished reloading resource files\n"; 3401 warn "finished reloading resource files\n";
2684} 3402}
2685 3403
2686sub init { 3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
2687 reload_resources; 3409 reload_resources;
2688} 3410}
2689 3411
2690sub cfg_load { 3412sub reload_config {
2691 open my $fh, "<:utf8", "$CONFDIR/config" 3413 open my $fh, "<:utf8", "$CONFDIR/config"
2692 or return; 3414 or return;
2693 3415
2694 local $/; 3416 local $/;
2695 *CFG = YAML::Syck::Load <$fh>; 3417 *CFG = YAML::Load <$fh>;
2696 3418
2697 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3419 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2698 3420
2699 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3421 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2700 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3422 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2711sub main { 3433sub main {
2712 # we must not ever block the main coroutine 3434 # we must not ever block the main coroutine
2713 local $Coro::idle = sub { 3435 local $Coro::idle = sub {
2714 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3436 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2715 (async { 3437 (async {
2716 Event::one_event; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3439 EV::loop EV::LOOP_ONESHOT;
2717 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
2718 }; 3441 };
2719 3442
2720 cfg_load; 3443 {
3444 my $guard = freeze_mainloop;
3445 reload_config;
2721 db_init; 3446 db_init;
2722 load_extensions; 3447 load_extensions;
2723 3448
2724 $TICK_WATCHER->start; 3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3450 }
3451
2725 Event::loop; 3452 EV::loop;
2726} 3453}
2727 3454
2728############################################################################# 3455#############################################################################
2729# initialisation and cleanup 3456# initialisation and cleanup
2730 3457
2731# install some emergency cleanup handlers 3458# install some emergency cleanup handlers
2732BEGIN { 3459BEGIN {
3460 our %SIGWATCHER = ();
2733 for my $signal (qw(INT HUP TERM)) { 3461 for my $signal (qw(INT HUP TERM)) {
2734 Event->signal ( 3462 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2735 reentrant => 0,
2736 data => WF_AUTOCANCEL,
2737 signal => $signal,
2738 prio => 0,
2739 cb => sub {
2740 cf::cleanup "SIG$signal"; 3463 cf::cleanup "SIG$signal";
2741 },
2742 ); 3464 };
2743 } 3465 }
2744} 3466}
2745 3467
2746sub write_runtime { 3468sub write_runtime_sync {
2747 my $runtime = "$LOCALDIR/runtime"; 3469 my $runtime = "$LOCALDIR/runtime";
2748 3470
2749 # first touch the runtime file to show we are still running: 3471 # first touch the runtime file to show we are still running:
2750 # the fsync below can take a very very long time. 3472 # the fsync below can take a very very long time.
2751 3473
2777 and return; 3499 and return;
2778 3500
2779 warn "runtime file written.\n"; 3501 warn "runtime file written.\n";
2780 3502
2781 1 3503 1
3504}
3505
3506our $uuid_lock;
3507our $uuid_skip;
3508
3509sub write_uuid_sync($) {
3510 $uuid_skip ||= $_[0];
3511
3512 return if $uuid_lock;
3513 local $uuid_lock = 1;
3514
3515 my $uuid = "$LOCALDIR/uuid";
3516
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return;
3519
3520 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3521 $uuid_skip = 0;
3522
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return;
3525
3526 # always fsync - this file is important
3527 aio_fsync $fh
3528 and return;
3529
3530 close $fh
3531 or return;
3532
3533 aio_rename "$uuid~", $uuid
3534 and return;
3535
3536 warn "uuid file written ($value).\n";
3537
3538 1
3539
3540}
3541
3542sub write_uuid($$) {
3543 my ($skip, $sync) = @_;
3544
3545 $sync ? write_uuid_sync $skip
3546 : async { write_uuid_sync $skip };
2782} 3547}
2783 3548
2784sub emergency_save() { 3549sub emergency_save() {
2785 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
2786 3551
2792 # and maps saved/destroyed asynchronously. 3557 # and maps saved/destroyed asynchronously.
2793 warn "begin emergency player save\n"; 3558 warn "begin emergency player save\n";
2794 for my $login (keys %cf::PLAYER) { 3559 for my $login (keys %cf::PLAYER) {
2795 my $pl = $cf::PLAYER{$login} or next; 3560 my $pl = $cf::PLAYER{$login} or next;
2796 $pl->valid or next; 3561 $pl->valid or next;
3562 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2797 $pl->save; 3563 $pl->save;
2798 } 3564 }
2799 warn "end emergency player save\n"; 3565 warn "end emergency player save\n";
2800 3566
2801 warn "begin emergency map save\n"; 3567 warn "begin emergency map save\n";
2807 warn "end emergency map save\n"; 3573 warn "end emergency map save\n";
2808 3574
2809 warn "begin emergency database checkpoint\n"; 3575 warn "begin emergency database checkpoint\n";
2810 BDB::db_env_txn_checkpoint $DB_ENV; 3576 BDB::db_env_txn_checkpoint $DB_ENV;
2811 warn "end emergency database checkpoint\n"; 3577 warn "end emergency database checkpoint\n";
3578
3579 warn "begin write uuid\n";
3580 write_uuid_sync 1;
3581 warn "end write uuid\n";
2812 }; 3582 };
2813 3583
2814 warn "leave emergency perl save\n"; 3584 warn "leave emergency perl save\n";
2815} 3585}
2816 3586
2818 my ($make_core) = @_; 3588 my ($make_core) = @_;
2819 3589
2820 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
2821 if $make_core; 3591 if $make_core;
2822} 3592}
3593
3594# a safer delete_package, copied from Symbol
3595sub clear_package($) {
3596 my $pkg = shift;
3597
3598 # expand to full symbol table name if needed
3599 unless ($pkg =~ /^main::.*::$/) {
3600 $pkg = "main$pkg" if $pkg =~ /^::/;
3601 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3602 $pkg .= '::' unless $pkg =~ /::$/;
3603 }
3604
3605 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3606 my $stem_symtab = *{$stem}{HASH};
3607
3608 defined $stem_symtab and exists $stem_symtab->{$leaf}
3609 or return;
3610
3611 # clear all symbols
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 }
3617 warn "cleared package #$pkg\n";#d#
3618}
3619
3620our $RELOAD; # how many times to reload
2823 3621
2824sub do_reload_perl() { 3622sub do_reload_perl() {
2825 # can/must only be called in main 3623 # can/must only be called in main
2826 if ($Coro::current != $Coro::main) { 3624 if ($Coro::current != $Coro::main) {
2827 warn "can only reload from main coroutine"; 3625 warn "can only reload from main coroutine";
2828 return; 3626 return;
2829 } 3627 }
2830 3628
3629 return if $RELOAD++;
3630
3631 while ($RELOAD) {
2831 warn "reloading..."; 3632 warn "reloading...";
2832 3633
2833 warn "entering sync_job"; 3634 warn "entering sync_job";
2834 3635
2835 cf::sync_job { 3636 cf::sync_job {
2836 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
2837 cf::emergency_save; 3638 cf::emergency_save;
2838 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
2839 3640
2840 warn "syncing database to disk"; 3641 warn "syncing database to disk";
2841 BDB::db_env_txn_checkpoint $DB_ENV; 3642 BDB::db_env_txn_checkpoint $DB_ENV;
2842 3643
2843 # if anything goes wrong in here, we should simply crash as we already saved 3644 # if anything goes wrong in here, we should simply crash as we already saved
2844 3645
2845 warn "cancelling all WF_AUTOCANCEL watchers";
2846 for (Event::all_watchers) {
2847 $_->cancel if $_->data & WF_AUTOCANCEL;
2848 }
2849
2850 warn "flushing outstanding aio requests"; 3646 warn "flushing outstanding aio requests";
2851 for (;;) {
2852 BDB::flush;
2853 IO::AIO::flush;
2854 Coro::cede;
2855 last unless IO::AIO::nreqs || BDB::nreqs; 3647 while (IO::AIO::nreqs || BDB::nreqs) {
2856 warn "iterate..."; 3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2857 }
2858
2859 ++$RELOAD;
2860
2861 warn "cancelling all extension coros";
2862 $_->cancel for values %EXT_CORO;
2863 %EXT_CORO = ();
2864
2865 warn "removing commands";
2866 %COMMAND = ();
2867
2868 warn "removing ext commands";
2869 %EXTCMD = ();
2870
2871 warn "unloading/nuking all extensions";
2872 for my $pkg (@EXTS) {
2873 warn "... unloading $pkg";
2874
2875 if (my $cb = $pkg->can ("unload")) {
2876 eval {
2877 $cb->($pkg);
2878 1
2879 } or warn "$pkg unloaded, but with errors: $@";
2880 } 3649 }
2881 3650
2882 warn "... nuking $pkg"; 3651 warn "cancelling all extension coros";
2883 Symbol::delete_package $pkg; 3652 $_->cancel for values %EXT_CORO;
2884 } 3653 %EXT_CORO = ();
2885 3654
2886 warn "unloading all perl modules loaded from $LIBDIR"; 3655 warn "removing commands";
2887 while (my ($k, $v) = each %INC) { 3656 %COMMAND = ();
2888 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2889 3657
3658 warn "removing ext/exti commands";
3659 %EXTCMD = ();
3660 %EXTICMD = ();
3661
3662 warn "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) {
2890 warn "... unloading $k"; 3664 warn "... unloading $pkg";
2891 delete $INC{$k};
2892 3665
2893 $k =~ s/\.pm$//;
2894 $k =~ s/\//::/g;
2895
2896 if (my $cb = $k->can ("unload_module")) { 3666 if (my $cb = $pkg->can ("unload")) {
3667 eval {
2897 $cb->(); 3668 $cb->($pkg);
3669 1
3670 } or warn "$pkg unloaded, but with errors: $@";
3671 }
3672
3673 warn "... clearing $pkg";
3674 clear_package $pkg;
2898 } 3675 }
2899 3676
2900 Symbol::delete_package $k; 3677 warn "unloading all perl modules loaded from $LIBDIR";
3678 while (my ($k, $v) = each %INC) {
3679 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3680
3681 warn "... unloading $k";
3682 delete $INC{$k};
3683
3684 $k =~ s/\.pm$//;
3685 $k =~ s/\//::/g;
3686
3687 if (my $cb = $k->can ("unload_module")) {
3688 $cb->();
3689 }
3690
3691 clear_package $k;
2901 } 3692 }
2902 3693
2903 warn "getting rid of safe::, as good as possible"; 3694 warn "getting rid of safe::, as good as possible";
2904 Symbol::delete_package "safe::$_" 3695 clear_package "safe::$_"
2905 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3696 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2906 3697
2907 warn "unloading cf.pm \"a bit\""; 3698 warn "unloading cf.pm \"a bit\"";
2908 delete $INC{"cf.pm"}; 3699 delete $INC{"cf.pm"};
2909 delete $INC{"cf/pod.pm"}; 3700 delete $INC{"cf/pod.pm"};
2910 3701
2911 # don't, removes xs symbols, too, 3702 # don't, removes xs symbols, too,
2912 # and global variables created in xs 3703 # and global variables created in xs
2913 #Symbol::delete_package __PACKAGE__; 3704 #clear_package __PACKAGE__;
2914 3705
2915 warn "unload completed, starting to reload now"; 3706 warn "unload completed, starting to reload now";
2916 3707
2917 warn "reloading cf.pm"; 3708 warn "reloading cf.pm";
2918 require cf; 3709 require cf;
2919 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2920 3711
2921 warn "loading config and database again"; 3712 warn "loading config and database again";
2922 cf::cfg_load; 3713 cf::reload_config;
2923 3714
2924 warn "loading extensions"; 3715 warn "loading extensions";
2925 cf::load_extensions; 3716 cf::load_extensions;
2926 3717
2927 warn "reattaching attachments to objects/players"; 3718 warn "reattaching attachments to objects/players";
2928 _global_reattach; # objects, sockets 3719 _global_reattach; # objects, sockets
2929 warn "reattaching attachments to maps"; 3720 warn "reattaching attachments to maps";
2930 reattach $_ for values %MAP; 3721 reattach $_ for values %MAP;
2931 warn "reattaching attachments to players"; 3722 warn "reattaching attachments to players";
2932 reattach $_ for values %PLAYER; 3723 reattach $_ for values %PLAYER;
2933 3724
2934 warn "leaving sync_job"; 3725 warn "leaving sync_job";
2935 3726
2936 1 3727 1
2937 } or do { 3728 } or do {
2938 warn $@; 3729 warn $@;
2939 warn "error while reloading, exiting."; 3730 cf::cleanup "error while reloading, exiting.";
2940 exit 1;
2941 }; 3731 };
2942 3732
2943 warn "reloaded"; 3733 warn "reloaded";
3734 --$RELOAD;
3735 }
2944}; 3736};
2945 3737
2946our $RELOAD_WATCHER; # used only during reload 3738our $RELOAD_WATCHER; # used only during reload
2947 3739
2948sub reload_perl() { 3740sub reload_perl() {
2949 # doing reload synchronously and two reloads happen back-to-back, 3741 # doing reload synchronously and two reloads happen back-to-back,
2950 # coro crashes during coro_state_free->destroy here. 3742 # coro crashes during coro_state_free->destroy here.
2951 3743
2952 $RELOAD_WATCHER ||= Event->timer ( 3744 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2953 reentrant => 0,
2954 after => 0,
2955 data => WF_AUTOCANCEL,
2956 cb => sub {
2957 do_reload_perl; 3745 do_reload_perl;
2958 undef $RELOAD_WATCHER; 3746 undef $RELOAD_WATCHER;
2959 },
2960 ); 3747 };
2961} 3748}
2962 3749
2963register_command "reload" => sub { 3750register_command "reload" => sub {
2964 my ($who, $arg) = @_; 3751 my ($who, $arg) = @_;
2965 3752
2966 if ($who->flag (FLAG_WIZ)) { 3753 if ($who->flag (FLAG_WIZ)) {
2967 $who->message ("reloading server."); 3754 $who->message ("reloading server.");
3755 async {
3756 $Coro::current->{desc} = "perl_reload";
2968 async { reload_perl }; 3757 reload_perl;
3758 };
2969 } 3759 }
2970}; 3760};
2971 3761
2972unshift @INC, $LIBDIR; 3762unshift @INC, $LIBDIR;
2973 3763
2975 3765
2976our @WAIT_FOR_TICK; 3766our @WAIT_FOR_TICK;
2977our @WAIT_FOR_TICK_BEGIN; 3767our @WAIT_FOR_TICK_BEGIN;
2978 3768
2979sub wait_for_tick { 3769sub wait_for_tick {
2980 return unless $TICK_WATCHER->is_active;
2981 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
2982 3771
2983 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
2984 push @WAIT_FOR_TICK, $signal; 3773 push @WAIT_FOR_TICK, $signal;
2985 $signal->wait; 3774 $signal->wait;
2986} 3775}
2987 3776
2988sub wait_for_tick_begin { 3777sub wait_for_tick_begin {
2989 return unless $TICK_WATCHER->is_active;
2990 return if $Coro::current == $Coro::main; 3778 return if tick_inhibit || $Coro::current == $Coro::main;
2991 3779
2992 my $signal = new Coro::Signal; 3780 my $signal = new Coro::Signal;
2993 push @WAIT_FOR_TICK_BEGIN, $signal; 3781 push @WAIT_FOR_TICK_BEGIN, $signal;
2994 $signal->wait; 3782 $signal->wait;
2995} 3783}
2996 3784
2997 my $min = 1e6;#d# 3785sub tick {
2998 my $avg = 10;
2999$TICK_WATCHER = Event->timer (
3000 reentrant => 0,
3001 parked => 1,
3002 prio => 0,
3003 at => $NEXT_TICK || $TICK,
3004 data => WF_AUTOCANCEL,
3005 cb => sub {
3006 if ($Coro::current != $Coro::main) { 3786 if ($Coro::current != $Coro::main) {
3007 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3787 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3008 unless ++$bug_warning > 10; 3788 unless ++$bug_warning > 10;
3009 return; 3789 return;
3010 } 3790 }
3011 3791
3012 $NOW = $tick_start = Event::time;
3013
3014 cf::server_tick; # one server iteration 3792 cf::server_tick; # one server iteration
3015 3793
3016 0 && sync_job {#d# 3794 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3017 for(1..10) { 3795 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3018 my $t = Event::time; 3796 Coro::async_pool {
3019 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3797 $Coro::current->{desc} = "runtime saver";
3020 or die; 3798 write_runtime_sync
3021 3799 or warn "ERROR: unable to write runtime file: $!";
3022 $map->width (50);
3023 $map->height (50);
3024 $map->alloc;
3025 $map->_load_objects ("/tmp/x.map", 1);
3026 my $t = Event::time - $t;
3027
3028 #next unless $t < 0.0013;#d#
3029 if ($t < $min) {
3030 $min = $t;
3031 }
3032 $avg = $avg * 0.99 + $t * 0.01;
3033 }
3034 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3035 exit 0;
3036 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3037 }; 3800 };
3801 }
3038 3802
3039 $RUNTIME += $TICK;
3040 $NEXT_TICK += $TICK;
3041
3042 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3043 $NEXT_RUNTIME_WRITE = $NOW + 10;
3044 Coro::async_pool {
3045 write_runtime
3046 or warn "ERROR: unable to write runtime file: $!";
3047 };
3048 }
3049
3050# my $AFTER = Event::time;
3051# warn $AFTER - $NOW;#d#
3052
3053 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3803 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3054 $sig->send; 3804 $sig->send;
3055 } 3805 }
3056 while (my $sig = shift @WAIT_FOR_TICK) { 3806 while (my $sig = shift @WAIT_FOR_TICK) {
3057 $sig->send; 3807 $sig->send;
3058 } 3808 }
3059 3809
3060 $NOW = Event::time; 3810 $LOAD = ($NOW - $TICK_START) / $TICK;
3061
3062 # if we are delayed by four ticks or more, skip them all
3063 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3064
3065 $TICK_WATCHER->at ($NEXT_TICK);
3066 $TICK_WATCHER->start;
3067
3068 $LOAD = ($NOW - $tick_start) / $TICK;
3069 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3811 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3070 3812
3071 _post_tick; 3813 if (0) {
3072 3814 if ($NEXT_TICK) {
3073 3815 my $jitter = $TICK_START - $NEXT_TICK;
3816 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3817 warn "jitter $JITTER\n";#d#
3818 }
3074 }, 3819 }
3075); 3820}
3076 3821
3077{ 3822{
3078 BDB::max_poll_time $TICK * 0.1; 3823 # configure BDB
3079 $BDB_POLL_WATCHER = Event->io ( 3824
3080 reentrant => 0,
3081 fd => BDB::poll_fileno,
3082 poll => 'r',
3083 prio => 0,
3084 data => WF_AUTOCANCEL,
3085 cb => \&BDB::poll_cb,
3086 );
3087 BDB::min_parallel 8; 3825 BDB::min_parallel 8;
3088 3826 BDB::max_poll_reqs $TICK * 0.1;
3089 BDB::set_sync_prepare { 3827 $AnyEvent::BDB::WATCHER->priority (1);
3090 my $status;
3091 my $current = $Coro::current;
3092 (
3093 sub {
3094 $status = $!;
3095 $current->ready; undef $current;
3096 },
3097 sub {
3098 Coro::schedule while defined $current;
3099 $! = $status;
3100 },
3101 )
3102 };
3103 3828
3104 unless ($DB_ENV) { 3829 unless ($DB_ENV) {
3105 $DB_ENV = BDB::db_env_create; 3830 $DB_ENV = BDB::db_env_create;
3831 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3832 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3833 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3834 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3835 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3106 3836
3107 cf::sync_job { 3837 cf::sync_job {
3108 eval { 3838 eval {
3109 BDB::db_env_open 3839 BDB::db_env_open
3110 $DB_ENV, 3840 $DB_ENV,
3112 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3842 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3113 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3843 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3114 0666; 3844 0666;
3115 3845
3116 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3846 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3117
3118 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3119 $DB_ENV->set_lk_detect;
3120 }; 3847 };
3121 3848
3122 cf::cleanup "db_env_open(db): $@" if $@; 3849 cf::cleanup "db_env_open(db): $@" if $@;
3123 }; 3850 };
3124 } 3851 }
3852
3853 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3854 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3855 };
3856 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3857 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3858 };
3859 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3860 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3861 };
3125} 3862}
3126 3863
3127{ 3864{
3865 # configure IO::AIO
3866
3128 IO::AIO::min_parallel 8; 3867 IO::AIO::min_parallel 8;
3129
3130 undef $Coro::AIO::WATCHER;
3131 IO::AIO::max_poll_time $TICK * 0.1; 3868 IO::AIO::max_poll_time $TICK * 0.1;
3132 $AIO_POLL_WATCHER = Event->io ( 3869 undef $AnyEvent::AIO::WATCHER;
3133 reentrant => 0,
3134 data => WF_AUTOCANCEL,
3135 fd => IO::AIO::poll_fileno,
3136 poll => 'r',
3137 prio => 6,
3138 cb => \&IO::AIO::poll_cb,
3139 );
3140} 3870}
3141 3871
3142my $_log_backtrace; 3872my $_log_backtrace;
3143 3873
3144sub _log_backtrace { 3874sub _log_backtrace {
3148 3878
3149 # limit the # of concurrent backtraces 3879 # limit the # of concurrent backtraces
3150 if ($_log_backtrace < 2) { 3880 if ($_log_backtrace < 2) {
3151 ++$_log_backtrace; 3881 ++$_log_backtrace;
3152 async { 3882 async {
3883 $Coro::current->{desc} = "abt $msg";
3884
3153 my @bt = fork_call { 3885 my @bt = fork_call {
3154 @addr = map { sprintf "%x", $_ } @addr; 3886 @addr = map { sprintf "%x", $_ } @addr;
3155 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3887 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3156 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3888 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3157 or die "addr2line: $!"; 3889 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines