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.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.448 by root, Fri Sep 19 05:30:23 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
39
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 68
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71{
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve";
85 Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
86}
46 87
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 89
49our %COMMAND = (); 90our %COMMAND = ();
50our %COMMAND_TIME = (); 91our %COMMAND_TIME = ();
56our %EXT_MAP = (); # pluggable maps 97our %EXT_MAP = (); # pluggable maps
57 98
58our $RELOAD; # number of reloads so far 99our $RELOAD; # number of reloads so far
59our @EVENT; 100our @EVENT;
60 101
61our $CONFDIR = confdir; 102our $CONFDIR = confdir;
62our $DATADIR = datadir; 103our $DATADIR = datadir;
63our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
64our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
65our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
66our $LOCALDIR = localdir; 107our $LOCALDIR = localdir;
67our $TMPDIR = "$LOCALDIR/" . tmpdir; 108our $TMPDIR = "$LOCALDIR/" . tmpdir;
68our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 109our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
69our $PLAYERDIR = "$LOCALDIR/" . playerdir; 110our $PLAYERDIR = "$LOCALDIR/" . playerdir;
70our $RANDOMDIR = "$LOCALDIR/random"; 111our $RANDOMDIR = "$LOCALDIR/random";
71our $BDBDIR = "$LOCALDIR/db"; 112our $BDBDIR = "$LOCALDIR/db";
113our $PIDFILE = "$LOCALDIR/pid";
114our $RUNTIMEFILE = "$LOCALDIR/runtime";
115
116our %RESOURCE;
72 117
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 118our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 120our $NEXT_TICK;
78our $NOW;
79our $USE_FSYNC = 1; # use fsync to write maps - default off 121our $USE_FSYNC = 1; # use fsync to write maps - default off
80 122
123our $BDB_DEADLOCK_WATCHER;
124our $BDB_CHECKPOINT_WATCHER;
81our $BDB_POLL_WATCHER; 125our $BDB_TRICKLE_WATCHER;
82our $DB_ENV; 126our $DB_ENV;
83 127
84our %CFG; 128our %CFG;
85 129
86our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
87our $RUNTIME; 131our $RUNTIME;
132our $NOW;
88 133
89our %PLAYER; # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
90our %MAP; # all maps 135our (%MAP, %MAP_LOADING ); # all maps
91our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
92 137
93# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
94our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
95 140
96our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
97our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
98our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
99 145
100binmode STDOUT; 146binmode STDOUT;
101binmode STDERR; 147binmode STDERR;
102 148
103# read virtual server time, if available 149# read virtual server time, if available
104unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 150unless ($RUNTIME || !-e $RUNTIMEFILE) {
105 open my $fh, "<", "$LOCALDIR/runtime" 151 open my $fh, "<", $RUNTIMEFILE
106 or die "unable to read runtime file: $!"; 152 or die "unable to read $RUNTIMEFILE file: $!";
107 $RUNTIME = <$fh> + 0.; 153 $RUNTIME = <$fh> + 0.;
108} 154}
109 155
110mkdir $_ 156mkdir $_
111 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
156 202
157The raw value load value from the last tick. 203The raw value load value from the last tick.
158 204
159=item %cf::CFG 205=item %cf::CFG
160 206
161Configuration for the server, loaded from C</etc/crossfire/config>, or 207Configuration for the server, loaded from C</etc/deliantra-server/config>, or
162from wherever your confdir points to. 208from wherever your confdir points to.
163 209
164=item cf::wait_for_tick, cf::wait_for_tick_begin 210=item cf::wait_for_tick, cf::wait_for_tick_begin
165 211
166These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 212These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
167returns directly I<after> the tick processing (and consequently, can only wake one process 213returns directly I<after> the tick processing (and consequently, can only wake one process
168per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 214per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
169 215
216=item @cf::INVOKE_RESULTS
217
218This array contains the results of the last C<invoke ()> call. When
219C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
220that call.
221
170=back 222=back
171 223
172=cut 224=cut
173 225
174BEGIN { 226BEGIN {
178 $msg .= "\n" 230 $msg .= "\n"
179 unless $msg =~ /\n$/; 231 unless $msg =~ /\n$/;
180 232
181 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
182 234
183 utf8::encode $msg;
184 LOG llevError, $msg; 235 LOG llevError, $msg;
185 }; 236 };
186} 237}
238
239$Coro::State::DIEHOOK = sub {
240 return unless $^S eq 0; # "eq", not "=="
241
242 if ($Coro::current == $Coro::main) {#d#
243 warn "DIEHOOK called in main context, Coro bug?\n";#d#
244 return;#d#
245 }#d#
246
247 # kill coroutine otherwise
248 warn Carp::longmess $_[0];
249 Coro::terminate
250};
251
252$SIG{__DIE__} = sub { }; #d#?
187 253
188@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 254@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
189@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 255@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
190@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 256@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
191@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 257@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
198for my $pkg (qw( 264for my $pkg (qw(
199 cf::global cf::attachable 265 cf::global cf::attachable
200 cf::object cf::object::player 266 cf::object cf::object::player
201 cf::client cf::player 267 cf::client cf::player
202 cf::arch cf::living 268 cf::arch cf::living
269 cf::map cf::mapspace
203 cf::map cf::party cf::region 270 cf::party cf::region
204)) { 271)) {
205 no strict 'refs';
206 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 272 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
207} 273}
208 274
209$Event::DIED = sub { 275$EV::DIED = sub {
210 warn "error in event callback: @_"; 276 warn "error in event callback: @_";
211}; 277};
212 278
213############################################################################# 279#############################################################################
214 280
237 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 303 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
238 $d 304 $d
239 } || "[unable to dump $_[0]: '$@']"; 305 } || "[unable to dump $_[0]: '$@']";
240} 306}
241 307
242use JSON::XS ();
243
244=item $ref = cf::from_json $json 308=item $ref = cf::decode_json $json
245 309
246Converts a JSON string into the corresponding perl data structure. 310Converts a JSON string into the corresponding perl data structure.
247 311
248=item $json = cf::to_json $ref 312=item $json = cf::encode_json $ref
249 313
250Converts a perl data structure into its JSON representation. 314Converts a perl data structure into its JSON representation.
251 315
252=cut 316=cut
253 317
254our $json_coder = JSON::XS->new->convert_blessed->utf8; 318our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 319
256sub to_json ($) { $json_coder->encode ($_[0]) } 320sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 321sub decode_json($) { $json_coder->decode ($_[0]) }
258 322
259=item cf::lock_wait $string 323=item cf::lock_wait $string
260 324
261Wait until the given lock is available. See cf::lock_acquire. 325Wait until the given lock is available. See cf::lock_acquire.
262 326
265Wait until the given lock is available and then acquires it and returns 329Wait until the given lock is available and then acquires it and returns
266a Coro::guard object. If the guard object gets destroyed (goes out of scope, 330a Coro::guard object. If the guard object gets destroyed (goes out of scope,
267for example when the coroutine gets canceled), the lock is automatically 331for example when the coroutine gets canceled), the lock is automatically
268returned. 332returned.
269 333
334Locks are *not* recursive, locking from the same coro twice results in a
335deadlocked coro.
336
270Lock names should begin with a unique identifier (for example, cf::map::find 337Lock names should begin with a unique identifier (for example, cf::map::find
271uses map_find and cf::map::load uses map_load). 338uses map_find and cf::map::load uses map_load).
272 339
273=item $locked = cf::lock_active $string 340=item $locked = cf::lock_active $string
274 341
275Return true if the lock is currently active, i.e. somebody has locked it. 342Return true if the lock is currently active, i.e. somebody has locked it.
276 343
277=cut 344=cut
278 345
279our %LOCK; 346our %LOCK;
347our %LOCKER;#d#
280 348
281sub lock_wait($) { 349sub lock_wait($) {
282 my ($key) = @_; 350 my ($key) = @_;
351
352 if ($LOCKER{$key} == $Coro::current) {#d#
353 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
354 return;#d#
355 }#d#
283 356
284 # wait for lock, if any 357 # wait for lock, if any
285 while ($LOCK{$key}) { 358 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current; 359 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule; 360 Coro::schedule;
293 366
294 # wait, to be sure we are not locked 367 # wait, to be sure we are not locked
295 lock_wait $key; 368 lock_wait $key;
296 369
297 $LOCK{$key} = []; 370 $LOCK{$key} = [];
371 $LOCKER{$key} = $Coro::current;#d#
298 372
299 Coro::guard { 373 Coro::guard {
374 delete $LOCKER{$key};#d#
300 # wake up all waiters, to be on the safe side 375 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} }; 376 $_->ready for @{ delete $LOCK{$key} };
302 } 377 }
303} 378}
304 379
307 382
308 ! ! $LOCK{$key} 383 ! ! $LOCK{$key}
309} 384}
310 385
311sub freeze_mainloop { 386sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 387 tick_inhibit_inc;
313 388
314 my $guard = Coro::guard { 389 Coro::guard \&tick_inhibit_dec;
315 $TICK_WATCHER->start; 390}
391
392=item cf::periodic $interval, $cb
393
394Like EV::periodic, but randomly selects a starting point so that the actions
395get spread over timer.
396
397=cut
398
399sub periodic($$) {
400 my ($interval, $cb) = @_;
401
402 my $start = rand List::Util::min 180, $interval;
403
404 EV::periodic $start, $interval, 0, $cb
405}
406
407=item cf::get_slot $time[, $priority[, $name]]
408
409Allocate $time seconds of blocking CPU time at priority C<$priority>:
410This call blocks and returns only when you have at least C<$time> seconds
411of cpu time till the next tick. The slot is only valid till the next cede.
412
413The optional C<$name> can be used to identify the job to run. It might be
414used for statistical purposes and should identify the same time-class.
415
416Useful for short background jobs.
417
418=cut
419
420our @SLOT_QUEUE;
421our $SLOT_QUEUE;
422
423$SLOT_QUEUE->cancel if $SLOT_QUEUE;
424$SLOT_QUEUE = Coro::async {
425 $Coro::current->desc ("timeslot manager");
426
427 my $signal = new Coro::Signal;
428
429 while () {
430 next_job:
431 my $avail = cf::till_tick;
432 if ($avail > 0.01) {
433 for (0 .. $#SLOT_QUEUE) {
434 if ($SLOT_QUEUE[$_][0] < $avail) {
435 my $job = splice @SLOT_QUEUE, $_, 1, ();
436 $job->[2]->send;
437 Coro::cede;
438 goto next_job;
439 }
440 }
441 }
442
443 if (@SLOT_QUEUE) {
444 # we do not use wait_for_tick() as it returns immediately when tick is inactive
445 push @cf::WAIT_FOR_TICK, $signal;
446 $signal->wait;
447 } else {
448 Coro::schedule;
449 }
316 }; 450 }
317 $TICK_WATCHER->stop; 451};
318 $guard 452
453sub get_slot($;$$) {
454 return if tick_inhibit || $Coro::current == $Coro::main;
455
456 my ($time, $pri, $name) = @_;
457
458 $time = $TICK * .6 if $time > $TICK * .6;
459 my $sig = new Coro::Signal;
460
461 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
462 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
463 $SLOT_QUEUE->ready;
464 $sig->wait;
319} 465}
320 466
321=item cf::async { BLOCK } 467=item cf::async { BLOCK }
322 468
323Currently the same as Coro::async_pool, meaning you cannot use 469Currently the same as Coro::async_pool, meaning you cannot use
328 474
329BEGIN { *async = \&Coro::async_pool } 475BEGIN { *async = \&Coro::async_pool }
330 476
331=item cf::sync_job { BLOCK } 477=item cf::sync_job { BLOCK }
332 478
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 479The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 480is always able to handle events or runnable, as Deliantra is only
335partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 481partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable. 482acceptable.
337 483
338If it must be done, put the blocking parts into C<sync_job>. This will run 484If it must be done, put the blocking parts into C<sync_job>. This will run
339the given BLOCK in another coroutine while waiting for the result. The 485the given BLOCK in another coroutine while waiting for the result. The
344 490
345sub sync_job(&) { 491sub sync_job(&) {
346 my ($job) = @_; 492 my ($job) = @_;
347 493
348 if ($Coro::current == $Coro::main) { 494 if ($Coro::current == $Coro::main) {
349 my $time = Event::time; 495 my $time = EV::time;
350 496
351 # this is the main coro, too bad, we have to block 497 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 498 # till the operation succeeds, freezing the server :/
353 499
354 # TODO: use suspend/resume instead 500 LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 501
356 my $freeze_guard = freeze_mainloop; 502 my $freeze_guard = freeze_mainloop;
357 503
358 my $busy = 1; 504 my $busy = 1;
359 my @res; 505 my @res;
360 506
361 (async { 507 (async {
508 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 509 @res = eval { $job->() };
363 warn $@ if $@; 510 warn $@ if $@;
364 undef $busy; 511 undef $busy;
365 })->prio (Coro::PRIO_MAX); 512 })->prio (Coro::PRIO_MAX);
366 513
367 while ($busy) { 514 while ($busy) {
368 Coro::cede or Event::one_event; 515 if (Coro::nready) {
516 Coro::cede_notself;
517 } else {
518 EV::loop EV::LOOP_ONESHOT;
369 } 519 }
520 }
370 521
371 $time = Event::time - $time; 522 my $time = EV::time - $time;
372 523
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 524 $TICK_START += $time; # do not account sync jobs to server load
377 525
378 wantarray ? @res : $res[0] 526 wantarray ? @res : $res[0]
379 } else { 527 } else {
380 # we are in another coroutine, how wonderful, everything just works 528 # we are in another coroutine, how wonderful, everything just works
381 529
406=item fork_call { }, $args 554=item fork_call { }, $args
407 555
408Executes the given code block with the given arguments in a seperate 556Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 557process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 558Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 559never block itself or use any form of event handling.
412 560
413=cut 561=cut
414 562
415sub fork_call(&@) { 563sub fork_call(&@) {
416 my ($cb, @args) = @_; 564 my ($cb, @args) = @_;
417 565
418# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 566 # we seemingly have to make a local copy of the whole thing,
419# or die "socketpair: $!"; 567 # otherwise perl prematurely frees the stuff :/
420 pipe my $fh1, my $fh2 568 # TODO: investigate and fix (likely this will be rather laborious)
421 or die "pipe: $!";
422 569
423 if (my $pid = fork) { 570 my @res = Coro::Util::fork_eval {
424 close $fh2;
425
426 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 die $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 571 reset_signals;
436 local $SIG{__WARN__}; 572 &$cb
437 local $SIG{__DIE__}; 573 }, @args;
438 eval {
439 close $fh1;
440 574
441 my @res = eval { $cb->(@args) }; 575 wantarray ? @res : $res[-1]
442 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 576}
443 };
444 577
445 warn $@ if $@; 578=item $coin = coin_from_name $name
446 _exit 0; 579
447 } 580=cut
581
582our %coin_alias = (
583 "silver" => "silvercoin",
584 "silvercoin" => "silvercoin",
585 "silvercoins" => "silvercoin",
586 "gold" => "goldcoin",
587 "goldcoin" => "goldcoin",
588 "goldcoins" => "goldcoin",
589 "platinum" => "platinacoin",
590 "platinumcoin" => "platinacoin",
591 "platinumcoins" => "platinacoin",
592 "platina" => "platinacoin",
593 "platinacoin" => "platinacoin",
594 "platinacoins" => "platinacoin",
595 "royalty" => "royalty",
596 "royalties" => "royalty",
597);
598
599sub coin_from_name($) {
600 $coin_alias{$_[0]}
601 ? cf::arch::find $coin_alias{$_[0]}
602 : undef
448} 603}
449 604
450=item $value = cf::db_get $family => $key 605=item $value = cf::db_get $family => $key
451 606
452Returns a single value from the environment database. 607Returns a single value from the environment database.
454=item cf::db_put $family => $key => $value 609=item cf::db_put $family => $key => $value
455 610
456Stores the given C<$value> in the family. It can currently store binary 611Stores the given C<$value> in the family. It can currently store binary
457data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 612data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
458 613
614=item $db = cf::db_table "name"
615
616Create and/or open a new database table. The string must not be "db" and must be unique
617within each server.
618
459=cut 619=cut
620
621sub db_table($) {
622 my ($name) = @_;
623 my $db = BDB::db_create $DB_ENV;
624
625 eval {
626 $db->set_flags (BDB::CHKSUM);
627
628 utf8::encode $name;
629 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
630 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
631 cf::cleanup "db_open(db): $!" if $!;
632 };
633 cf::cleanup "db_open(db): $@" if $@;
634
635 $db
636}
460 637
461our $DB; 638our $DB;
462 639
463sub db_init { 640sub db_init {
464 unless ($DB) {
465 $DB = BDB::db_create $DB_ENV;
466
467 cf::sync_job { 641 cf::sync_job {
468 eval { 642 $DB ||= db_table "db";
469 $DB->set_flags (BDB::CHKSUM);
470
471 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
472 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
473 cf::cleanup "db_open(db): $!" if $!;
474 };
475 cf::cleanup "db_open(db): $@" if $@;
476 };
477 } 643 };
478} 644}
479 645
480sub db_get($$) { 646sub db_get($$) {
481 my $key = "$_[0]/$_[1]"; 647 my $key = "$_[0]/$_[1]";
482 648
532 if (1) { 698 if (1) {
533 $md5 = 699 $md5 =
534 join "\x00", 700 join "\x00",
535 $processversion, 701 $processversion,
536 map { 702 map {
537 Coro::cede; 703 cf::cede_to_tick;
538 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 704 ($src->[$_], Digest::MD5::md5_hex $data[$_])
539 } 0.. $#$src; 705 } 0.. $#$src;
540 706
541 707
542 my $dbmd5 = db_get cache => "$id/md5"; 708 my $dbmd5 = db_get cache => "$id/md5";
580 746
581############################################################################# 747#############################################################################
582 748
583=head2 ATTACHABLE OBJECTS 749=head2 ATTACHABLE OBJECTS
584 750
585Many objects in crossfire are so-called attachable objects. That means you can 751Many objects in deliantra are so-called attachable objects. That means you can
586attach callbacks/event handlers (a collection of which is called an "attachment") 752attach callbacks/event handlers (a collection of which is called an "attachment")
587to it. All such attachable objects support the following methods. 753to it. All such attachable objects support the following methods.
588 754
589In the following description, CLASS can be any of C<global>, C<object> 755In the following description, CLASS can be any of C<global>, C<object>
590C<player>, C<client> or C<map> (i.e. the attachable objects in 756C<player>, C<client> or C<map> (i.e. the attachable objects in
591Crossfire TRT). 757Deliantra).
592 758
593=over 4 759=over 4
594 760
595=item $attachable->attach ($attachment, key => $value...) 761=item $attachable->attach ($attachment, key => $value...)
596 762
640=item cf::CLASS::attachment $name, ... 806=item cf::CLASS::attachment $name, ...
641 807
642Register an attachment by C<$name> through which attachable objects of the 808Register an attachment by C<$name> through which attachable objects of the
643given CLASS can refer to this attachment. 809given CLASS can refer to this attachment.
644 810
645Some classes such as crossfire maps and objects can specify attachments 811Some classes such as deliantra maps and objects can specify attachments
646that are attached at load/instantiate time, thus the need for a name. 812that are attached at load/instantiate time, thus the need for a name.
647 813
648These calls expect any number of the following handler/hook descriptions: 814These calls expect any number of the following handler/hook descriptions:
649 815
650=over 4 816=over 4
848 "; 1014 ";
849 die if $@; 1015 die if $@;
850} 1016}
851 1017
852our $override; 1018our $override;
853our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1019our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
854 1020
855sub override { 1021sub override {
856 $override = 1; 1022 $override = 1;
857 @invoke_results = (); 1023 @INVOKE_RESULTS = (@_);
858} 1024}
859 1025
860sub do_invoke { 1026sub do_invoke {
861 my $event = shift; 1027 my $event = shift;
862 my $callbacks = shift; 1028 my $callbacks = shift;
863 1029
864 @invoke_results = (); 1030 @INVOKE_RESULTS = ();
865 1031
866 local $override; 1032 local $override;
867 1033
868 for (@$callbacks) { 1034 for (@$callbacks) {
869 eval { &{$_->[1]} }; 1035 eval { &{$_->[1]} };
878 } 1044 }
879 1045
880 0 1046 0
881} 1047}
882 1048
883=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1049=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
884 1050
885=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1051=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
886 1052
887Generate an object-specific event with the given arguments. 1053Generate an object-specific event with the given arguments.
888 1054
889This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1055This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
890removed in future versions), and there is no public API to access override 1056removed in future versions), and there is no public API to access override
891results (if you must, access C<@cf::invoke_results> directly). 1057results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892 1058
893=back 1059=back
894 1060
895=cut 1061=cut
896 1062
897############################################################################# 1063#############################################################################
898# object support 1064# object support
1065
1066sub _object_equal($$);
1067sub _object_equal($$) {
1068 my ($a, $b) = @_;
1069
1070 return 0 unless (ref $a) eq (ref $b);
1071
1072 if ("HASH" eq ref $a) {
1073 my @ka = keys %$a;
1074 my @kb = keys %$b;
1075
1076 return 0 if @ka != @kb;
1077
1078 for (0 .. $#ka) {
1079 return 0 unless $ka[$_] eq $kb[$_];
1080 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1081 }
1082
1083 } elsif ("ARRAY" eq ref $a) {
1084
1085 return 0 if @$a != @$b;
1086
1087 for (0 .. $#$a) {
1088 return 0 unless _object_equal $a->[$_], $b->[$_];
1089 }
1090
1091 } elsif ($a ne $b) {
1092 return 0;
1093 }
1094
1095 1
1096}
1097
1098our $SLOW_MERGES;#d#
1099sub _can_merge {
1100 my ($ob1, $ob2) = @_;
1101
1102 ++$SLOW_MERGES;#d#
1103
1104 # we do the slow way here
1105 return _object_equal $ob1, $ob2
1106}
899 1107
900sub reattach { 1108sub reattach {
901 # basically do the same as instantiate, without calling instantiate 1109 # basically do the same as instantiate, without calling instantiate
902 my ($obj) = @_; 1110 my ($obj) = @_;
903 1111
1112 # no longer needed after getting rid of delete_package?
904 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1113 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
905 1114
906 my $registry = $obj->registry; 1115 my $registry = $obj->registry;
907 1116
908 @$registry = (); 1117 @$registry = ();
909 1118
924cf::attachable->attach ( 1133cf::attachable->attach (
925 prio => -1000000, 1134 prio => -1000000,
926 on_instantiate => sub { 1135 on_instantiate => sub {
927 my ($obj, $data) = @_; 1136 my ($obj, $data) = @_;
928 1137
929 $data = from_json $data; 1138 $data = decode_json $data;
930 1139
931 for (@$data) { 1140 for (@$data) {
932 my ($name, $args) = @$_; 1141 my ($name, $args) = @$_;
933 1142
934 $obj->attach ($name, %{$args || {} }); 1143 $obj->attach ($name, %{$args || {} });
950sub object_freezer_save { 1159sub object_freezer_save {
951 my ($filename, $rdata, $objs) = @_; 1160 my ($filename, $rdata, $objs) = @_;
952 1161
953 sync_job { 1162 sync_job {
954 if (length $$rdata) { 1163 if (length $$rdata) {
1164 utf8::decode (my $decname = $filename);
955 warn sprintf "saving %s (%d,%d)\n", 1165 warn sprintf "saving %s (%d,%d)\n",
956 $filename, length $$rdata, scalar @$objs; 1166 $decname, length $$rdata, scalar @$objs;
957 1167
958 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
959 chmod SAVE_MODE, $fh; 1169 aio_chmod $fh, SAVE_MODE;
960 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1171 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1172 aio_close $fh;
963 1173
964 if (@$objs) { 1174 if (@$objs) {
965 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
966 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
967 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
968 aio_write $fh, 0, (length $data), $data, 0; 1178 aio_write $fh, 0, (length $data), $data, 0;
969 aio_fsync $fh if $cf::USE_FSYNC; 1179 aio_fsync $fh if $cf::USE_FSYNC;
970 close $fh; 1180 aio_close $fh;
971 aio_rename "$filename.pst~", "$filename.pst"; 1181 aio_rename "$filename.pst~", "$filename.pst";
972 } 1182 }
973 } else { 1183 } else {
974 aio_unlink "$filename.pst"; 1184 aio_unlink "$filename.pst";
975 } 1185 }
980 } 1190 }
981 } else { 1191 } else {
982 aio_unlink $filename; 1192 aio_unlink $filename;
983 aio_unlink "$filename.pst"; 1193 aio_unlink "$filename.pst";
984 } 1194 }
985 } 1195 };
986} 1196}
987 1197
988sub object_freezer_as_string { 1198sub object_freezer_as_string {
989 my ($rdata, $objs) = @_; 1199 my ($rdata, $objs) = @_;
990 1200
1002 or return; 1212 or return;
1003 1213
1004 unless (aio_stat "$filename.pst") { 1214 unless (aio_stat "$filename.pst") {
1005 (aio_load "$filename.pst", $av) >= 0 1215 (aio_load "$filename.pst", $av) >= 0
1006 or return; 1216 or return;
1217
1007 $av = eval { (Storable::thaw $av)->{objs} }; 1218 my $st = eval { Coro::Storable::thaw $av };
1219 $av = $st->{objs};
1008 } 1220 }
1009 1221
1222 utf8::decode (my $decname = $filename);
1010 warn sprintf "loading %s (%d)\n", 1223 warn sprintf "loading %s (%d,%d)\n",
1011 $filename, length $data, scalar @{$av || []}; 1224 $decname, length $data, scalar @{$av || []};
1225
1012 return ($data, $av); 1226 ($data, $av)
1013} 1227}
1014 1228
1015=head2 COMMAND CALLBACKS 1229=head2 COMMAND CALLBACKS
1016 1230
1017=over 4 1231=over 4
1087 cf::override; 1301 cf::override;
1088 }, 1302 },
1089 on_extcmd => sub { 1303 on_extcmd => sub {
1090 my ($pl, $buf) = @_; 1304 my ($pl, $buf) = @_;
1091 1305
1092 my $msg = eval { from_json $buf }; 1306 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093 1307
1094 if (ref $msg) { 1308 if (ref $msg) {
1309 my ($type, $reply, @payload) =
1310 "ARRAY" eq ref $msg
1311 ? @$msg
1312 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1313
1314 my @reply;
1315
1095 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1316 if (my $cb = $EXTCMD{$type}) {
1096 if (my %reply = $cb->($pl, $msg)) { 1317 @reply = $cb->($pl, @payload);
1097 $pl->ext_reply ($msg->{msgid}, %reply);
1098 }
1099 } 1318 }
1319
1320 $pl->ext_reply ($reply, @reply)
1321 if $reply;
1322
1100 } else { 1323 } else {
1101 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102 } 1325 }
1103 1326
1104 cf::override; 1327 cf::override;
1131 1354
1132 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1355 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1133 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1356 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1134 1357
1135 $ext{source} = 1358 $ext{source} =
1136 "package $pkg; use strict; use utf8;\n" 1359 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1137 . "#line 1 \"$path\"\n{\n" 1360 . "#line 1 \"$path\"\n{\n"
1138 . $source 1361 . $source
1139 . "\n};\n1"; 1362 . "\n};\n1";
1140 1363
1141 $todo{$base} = \%ext; 1364 $todo{$base} = \%ext;
1157 my $msg = $@ ? "$v->{path}: $@\n" 1380 my $msg = $@ ? "$v->{path}: $@\n"
1158 : "$v->{base}: extension inactive.\n"; 1381 : "$v->{base}: extension inactive.\n";
1159 1382
1160 if (exists $v->{meta}{mandatory}) { 1383 if (exists $v->{meta}{mandatory}) {
1161 warn $msg; 1384 warn $msg;
1162 warn "mandatory extension failed to load, exiting.\n"; 1385 cf::cleanup "mandatory extension failed to load, exiting.";
1163 exit 1;
1164 } 1386 }
1165 1387
1166 warn $msg; 1388 warn $msg;
1167 } 1389 }
1168 1390
1182 1404
1183=back 1405=back
1184 1406
1185=head2 CORE EXTENSIONS 1407=head2 CORE EXTENSIONS
1186 1408
1187Functions and methods that extend core crossfire objects. 1409Functions and methods that extend core deliantra objects.
1188 1410
1189=cut 1411=cut
1190 1412
1191package cf::player; 1413package cf::player;
1192 1414
1193use Coro::AIO; 1415use Coro::AIO;
1194 1416
1195=head3 cf::player 1417=head3 cf::player
1196 1418
1197=over 4 1419=over 4
1420
1421=item cf::player::num_playing
1422
1423Returns the official number of playing players, as per the Crossfire metaserver rules.
1424
1425=cut
1426
1427sub num_playing {
1428 scalar grep
1429 $_->ob->map
1430 && !$_->hidden
1431 && !$_->ob->flag (cf::FLAG_WIZ),
1432 cf::player::list
1433}
1198 1434
1199=item cf::player::find $login 1435=item cf::player::find $login
1200 1436
1201Returns the given player object, loading it if necessary (might block). 1437Returns the given player object, loading it if necessary (might block).
1202 1438
1238 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1474 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1475 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1476 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241 aio_unlink +(playerdir $login) . "/$login.pl"; 1477 aio_unlink +(playerdir $login) . "/$login.pl";
1242 1478
1243 my $pl = load_pl path $login 1479 my $f = new_from_file cf::object::thawer path $login
1244 or return; 1480 or return;
1481
1482 my $pl = cf::player::load_pl $f
1483 or return;
1484
1485 local $cf::PLAYER_LOADING{$login} = $pl;
1486 $f->resolve_delayed_derefs;
1245 $cf::PLAYER{$login} = $pl 1487 $cf::PLAYER{$login} = $pl
1246 } 1488 }
1247 } 1489 }
1248} 1490}
1249 1491
1258 return if $pl->{deny_save}; 1500 return if $pl->{deny_save};
1259 1501
1260 aio_mkdir playerdir $pl, 0770; 1502 aio_mkdir playerdir $pl, 0770;
1261 $pl->{last_save} = $cf::RUNTIME; 1503 $pl->{last_save} = $cf::RUNTIME;
1262 1504
1505 cf::get_slot 0.01;
1506
1263 $pl->save_pl ($path); 1507 $pl->save_pl ($path);
1264 Coro::cede; 1508 cf::cede_to_tick;
1265} 1509}
1266 1510
1267sub new($) { 1511sub new($) {
1268 my ($login) = @_; 1512 my ($login) = @_;
1269 1513
1275 $cf::PLAYER{$login} = $self; 1519 $cf::PLAYER{$login} = $self;
1276 1520
1277 $self 1521 $self
1278} 1522}
1279 1523
1524=item $player->send_msg ($channel, $msg, $color, [extra...])
1525
1526=cut
1527
1528sub send_msg {
1529 my $ns = shift->ns
1530 or return;
1531 $ns->send_msg (@_);
1532}
1533
1280=item $pl->quit_character 1534=item $pl->quit_character
1281 1535
1282Nukes the player without looking back. If logged in, the connection will 1536Nukes the player without looking back. If logged in, the connection will
1283be destroyed. May block for a long time. 1537be destroyed. May block for a long time.
1284 1538
1288 my ($pl) = @_; 1542 my ($pl) = @_;
1289 1543
1290 my $name = $pl->ob->name; 1544 my $name = $pl->ob->name;
1291 1545
1292 $pl->{deny_save} = 1; 1546 $pl->{deny_save} = 1;
1293 $pl->password ("*"); # this should lock out the player until we nuked the dir 1547 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1294 1548
1295 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1549 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1296 $pl->deactivate; 1550 $pl->deactivate;
1551 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1552 $pl->ob->check_score;
1297 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1553 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1298 $pl->ns->destroy if $pl->ns; 1554 $pl->ns->destroy if $pl->ns;
1299 1555
1300 my $path = playerdir $pl; 1556 my $path = playerdir $pl;
1301 my $temp = "$path~$cf::RUNTIME~deleting~"; 1557 my $temp = "$path~$cf::RUNTIME~deleting~";
1337 or return []; 1593 or return [];
1338 1594
1339 my @logins; 1595 my @logins;
1340 1596
1341 for my $login (@$dirs) { 1597 for my $login (@$dirs) {
1598 my $path = path $login;
1599
1600 # a .pst is a dead give-away for a valid player
1601 # if no pst file found, open and chekc for blocked users
1602 if (aio_stat "$path.pst") {
1342 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1603 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1343 aio_read $fh, 0, 512, my $buf, 0 or next; 1604 aio_read $fh, 0, 512, my $buf, 0 or next;
1344 $buf !~ /^password -------------$/m or next; # official not-valid tag 1605 $buf !~ /^password -------------$/m or next; # official not-valid tag
1606 }
1345 1607
1346 utf8::decode $login; 1608 utf8::decode $login;
1347 push @logins, $login; 1609 push @logins, $login;
1348 } 1610 }
1349 1611
1376 } 1638 }
1377 1639
1378 \@paths 1640 \@paths
1379} 1641}
1380 1642
1381=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1643=item $protocol_xml = $player->expand_cfpod ($cfpod)
1382 1644
1383Expand crossfire pod fragments into protocol xml. 1645Expand deliantra pod fragments into protocol xml.
1384 1646
1385=cut
1386
1387sub expand_cfpod {
1388 ((my $self), (local $_)) = @_;
1389
1390 # escape & and <
1391 s/&/&amp;/g;
1392 s/(?<![BIUGH])</&lt;/g;
1393
1394 # this is buggy, it needs to properly take care of nested <'s
1395
1396 1 while
1397 # replace B<>, I<>, U<> etc.
1398 s/B<([^\>]*)>/<b>$1<\/b>/
1399 || s/I<([^\>]*)>/<i>$1<\/i>/
1400 || s/U<([^\>]*)>/<u>$1<\/u>/
1401 # replace G<male|female> tags
1402 || s{G<([^>|]*)\|([^>]*)>}{
1403 $self->gender ? $2 : $1
1404 }ge
1405 # replace H<hint text>
1406 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1407
1408 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g;
1410
1411 $_
1412}
1413
1414=item $player->ext_reply ($msgid, %msg) 1647=item $player->ext_reply ($msgid, @msg)
1415 1648
1416Sends an ext reply to the player. 1649Sends an ext reply to the player.
1417 1650
1418=cut 1651=cut
1419 1652
1420sub ext_reply($$%) { 1653sub ext_reply($$@) {
1421 my ($self, $id, %msg) = @_; 1654 my ($self, $id, @msg) = @_;
1422 1655
1423 $msg{msgid} = $id; 1656 $self->ns->ext_reply ($id, @msg)
1424 $self->send ("ext " . cf::to_json \%msg);
1425} 1657}
1426 1658
1427=item $player->ext_event ($type, %msg) 1659=item $player->ext_msg ($type, @msg)
1428 1660
1429Sends an ext event to the client. 1661Sends an ext event to the client.
1430 1662
1431=cut 1663=cut
1432 1664
1433sub ext_event($$%) { 1665sub ext_msg($$@) {
1434 my ($self, $type, %msg) = @_; 1666 my ($self, $type, @msg) = @_;
1435 1667
1436 $self->ns->ext_event ($type, %msg); 1668 $self->ns->ext_msg ($type, @msg);
1437} 1669}
1438 1670
1439=head3 cf::region 1671=head3 cf::region
1440 1672
1441=over 4 1673=over 4
1454 my ($path) = @_; 1686 my ($path) = @_;
1455 1687
1456 my ($match, $specificity); 1688 my ($match, $specificity);
1457 1689
1458 for my $region (list) { 1690 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1691 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1692 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1693 if $region->specificity > $specificity;
1462 } 1694 }
1463 } 1695 }
1464 1696
1485our $MAX_RESET = 3600; 1717our $MAX_RESET = 3600;
1486our $DEFAULT_RESET = 3000; 1718our $DEFAULT_RESET = 3000;
1487 1719
1488sub generate_random_map { 1720sub generate_random_map {
1489 my ($self, $rmp) = @_; 1721 my ($self, $rmp) = @_;
1722
1723 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1724
1490 # mit "rum" bekleckern, nicht 1725 # mit "rum" bekleckern, nicht
1491 $self->_create_random_map ( 1726 $self->_create_random_map (
1492 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1727 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1493 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1728 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1494 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1729 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1584 $self->init; # pass $1 etc. 1819 $self->init; # pass $1 etc.
1585 return $self; 1820 return $self;
1586 } 1821 }
1587 } 1822 }
1588 1823
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 1824 Carp::cluck "unable to resolve path '$path' (base '$base').";
1590 () 1825 ()
1591} 1826}
1592 1827
1593sub init { 1828sub init {
1594 my ($self) = @_; 1829 my ($self) = @_;
1616 1851
1617# the temporary/swap location 1852# the temporary/swap location
1618sub save_path { 1853sub save_path {
1619 my ($self) = @_; 1854 my ($self) = @_;
1620 1855
1621 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1856 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1622 "$TMPDIR/$path.map" 1857 "$TMPDIR/$path.map"
1623} 1858}
1624 1859
1625# the unique path, undef == no special unique path 1860# the unique path, undef == no special unique path
1626sub uniq_path { 1861sub uniq_path {
1627 my ($self) = @_; 1862 my ($self) = @_;
1628 1863
1629 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1630 "$UNIQUEDIR/$path" 1865 "$UNIQUEDIR/$path"
1631} 1866}
1632 1867
1633# and all this just because we cannot iterate over 1868# and all this just because we cannot iterate over
1634# all maps in C++... 1869# all maps in C++...
1657 1892
1658sub load_header_from($) { 1893sub load_header_from($) {
1659 my ($self, $path) = @_; 1894 my ($self, $path) = @_;
1660 1895
1661 utf8::encode $path; 1896 utf8::encode $path;
1662 #aio_open $path, O_RDONLY, 0 1897 my $f = new_from_file cf::object::thawer $path
1663 # or return;
1664
1665 $self->_load_header ($path)
1666 or return; 1898 or return;
1899
1900 $self->_load_header ($f)
1901 or return;
1902
1903 local $MAP_LOADING{$self->{path}} = $self;
1904 $f->resolve_delayed_derefs;
1667 1905
1668 $self->{load_path} = $path; 1906 $self->{load_path} = $path;
1669 1907
1670 1 1908 1
1671} 1909}
1725sub find { 1963sub find {
1726 my ($path, $origin) = @_; 1964 my ($path, $origin) = @_;
1727 1965
1728 $path = normalise $path, $origin && $origin->path; 1966 $path = normalise $path, $origin && $origin->path;
1729 1967
1968 cf::lock_wait "map_data:$path";#d#remove
1730 cf::lock_wait "map_find:$path"; 1969 cf::lock_wait "map_find:$path";
1731 1970
1732 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1733 my $guard = cf::lock_acquire "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
1974
1734 my $map = new_from_path cf::map $path 1975 my $map = new_from_path cf::map $path
1735 or return; 1976 or return;
1736 1977
1737 $map->{last_save} = $cf::RUNTIME; 1978 $map->{last_save} = $cf::RUNTIME;
1738 1979
1740 or return; 1981 or return;
1741 1982
1742 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1983 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1743 # doing this can freeze the server in a sync job, obviously 1984 # doing this can freeze the server in a sync job, obviously
1744 #$cf::WAIT_FOR_TICK->wait; 1985 #$cf::WAIT_FOR_TICK->wait;
1986 undef $guard2;
1987 undef $guard1;
1745 $map->reset; 1988 $map->reset;
1746 undef $guard;
1747 return find $path; 1989 return find $path;
1748 } 1990 }
1749 1991
1750 $cf::MAP{$path} = $map 1992 $cf::MAP{$path} = $map
1751 } 1993 }
1760 local $self->{deny_reset} = 1; # loading can take a long time 2002 local $self->{deny_reset} = 1; # loading can take a long time
1761 2003
1762 my $path = $self->{path}; 2004 my $path = $self->{path};
1763 2005
1764 { 2006 {
1765 my $guard = cf::lock_acquire "map_load:$path"; 2007 my $guard = cf::lock_acquire "map_data:$path";
1766 2008
2009 return unless $self->valid;
1767 return if $self->in_memory != cf::MAP_SWAPPED; 2010 return unless $self->in_memory == cf::MAP_SWAPPED;
1768 2011
1769 $self->in_memory (cf::MAP_LOADING); 2012 $self->in_memory (cf::MAP_LOADING);
1770 2013
1771 $self->alloc; 2014 $self->alloc;
1772 2015
1773 $self->pre_load; 2016 $self->pre_load;
1774 Coro::cede; 2017 cf::cede_to_tick;
1775 2018
2019 my $f = new_from_file cf::object::thawer $self->{load_path};
2020 $f->skip_block;
1776 $self->_load_objects ($self->{load_path}, 1) 2021 $self->_load_objects ($f)
1777 or return; 2022 or return;
1778 2023
1779 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2024 $self->post_load_original
1780 if delete $self->{load_original}; 2025 if delete $self->{load_original};
1781 2026
1782 if (my $uniq = $self->uniq_path) { 2027 if (my $uniq = $self->uniq_path) {
1783 utf8::encode $uniq; 2028 utf8::encode $uniq;
1784 if (aio_open $uniq, O_RDONLY, 0) { 2029 unless (aio_stat $uniq) {
2030 if (my $f = new_from_file cf::object::thawer $uniq) {
1785 $self->clear_unique_items; 2031 $self->clear_unique_items;
1786 $self->_load_objects ($uniq, 0); 2032 $self->_load_objects ($f);
2033 $f->resolve_delayed_derefs;
2034 }
1787 } 2035 }
1788 } 2036 }
1789 2037
1790 Coro::cede; 2038 $f->resolve_delayed_derefs;
2039
2040 cf::cede_to_tick;
1791 # now do the right thing for maps 2041 # now do the right thing for maps
1792 $self->link_multipart_objects; 2042 $self->link_multipart_objects;
1793 $self->difficulty ($self->estimate_difficulty) 2043 $self->difficulty ($self->estimate_difficulty)
1794 unless $self->difficulty; 2044 unless $self->difficulty;
1795 Coro::cede; 2045 cf::cede_to_tick;
1796 2046
1797 unless ($self->{deny_activate}) { 2047 unless ($self->{deny_activate}) {
1798 $self->decay_objects; 2048 $self->decay_objects;
1799 $self->fix_auto_apply; 2049 $self->fix_auto_apply;
1800 $self->update_buttons; 2050 $self->update_buttons;
1801 Coro::cede; 2051 cf::cede_to_tick;
1802 $self->set_darkness_map; 2052 $self->set_darkness_map;
1803 Coro::cede; 2053 cf::cede_to_tick;
1804 $self->activate; 2054 $self->activate;
1805 } 2055 }
1806 2056
2057 $self->{last_save} = $cf::RUNTIME;
2058 $self->last_access ($cf::RUNTIME);
2059
1807 $self->in_memory (cf::MAP_IN_MEMORY); 2060 $self->in_memory (cf::MAP_ACTIVE);
1808 } 2061 }
1809 2062
1810 $self->post_load; 2063 $self->post_load;
1811} 2064}
1812 2065
1821 2074
1822 $self 2075 $self
1823} 2076}
1824 2077
1825# find and load all maps in the 3x3 area around a map 2078# find and load all maps in the 3x3 area around a map
1826sub load_diag { 2079sub load_neighbours {
1827 my ($map) = @_; 2080 my ($map) = @_;
1828 2081
1829 my @diag; # diagonal neighbours 2082 my @neigh; # diagonal neighbours
1830 2083
1831 for (0 .. 3) { 2084 for (0 .. 3) {
1832 my $neigh = $map->tile_path ($_) 2085 my $neigh = $map->tile_path ($_)
1833 or next; 2086 or next;
1834 $neigh = find $neigh, $map 2087 $neigh = find $neigh, $map
1835 or next; 2088 or next;
1836 $neigh->load; 2089 $neigh->load;
1837 2090
2091 push @neigh,
1838 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2092 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1839 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2093 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1840 } 2094 }
1841 2095
1842 for (@diag) { 2096 for (grep defined $_->[0], @neigh) {
2097 my ($path, $origin) = @$_;
1843 my $neigh = find @$_ 2098 my $neigh = find $path, $origin
1844 or next; 2099 or next;
1845 $neigh->load; 2100 $neigh->load;
1846 } 2101 }
1847} 2102}
1848 2103
1853} 2108}
1854 2109
1855sub do_load_sync { 2110sub do_load_sync {
1856 my ($map) = @_; 2111 my ($map) = @_;
1857 2112
2113 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2114 if $Coro::current == $Coro::main;
2115
1858 cf::sync_job { $map->load }; 2116 cf::sync_job { $map->load };
1859} 2117}
1860 2118
1861our %MAP_PREFETCH; 2119our %MAP_PREFETCH;
1862our $MAP_PREFETCHER = undef; 2120our $MAP_PREFETCHER = undef;
1863 2121
1864sub find_async { 2122sub find_async {
1865 my ($path, $origin) = @_; 2123 my ($path, $origin, $load) = @_;
1866 2124
1867 $path = normalise $path, $origin && $origin->{path}; 2125 $path = normalise $path, $origin && $origin->{path};
1868 2126
1869 if (my $map = $cf::MAP{$path}) { 2127 if (my $map = $cf::MAP{$path}) {
1870 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2128 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1871 } 2129 }
1872 2130
1873 undef $MAP_PREFETCH{$path}; 2131 $MAP_PREFETCH{$path} |= $load;
2132
1874 $MAP_PREFETCHER ||= cf::async { 2133 $MAP_PREFETCHER ||= cf::async {
2134 $Coro::current->{desc} = "map prefetcher";
2135
1875 while (%MAP_PREFETCH) { 2136 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 2137 while (my ($k, $v) = each %MAP_PREFETCH) {
1877 my $map = find $path 2138 if (my $map = find $k) {
1878 or next;
1879 $map->load; 2139 $map->load if $v;
2140 }
1880 2141
1881 delete $MAP_PREFETCH{$path}; 2142 delete $MAP_PREFETCH{$k};
1882 } 2143 }
1883 } 2144 }
1884 undef $MAP_PREFETCHER; 2145 undef $MAP_PREFETCHER;
1885 }; 2146 };
1886 $MAP_PREFETCHER->prio (6); 2147 $MAP_PREFETCHER->prio (6);
1889} 2150}
1890 2151
1891sub save { 2152sub save {
1892 my ($self) = @_; 2153 my ($self) = @_;
1893 2154
1894 my $lock = cf::lock_acquire "map_data:" . $self->path; 2155 my $lock = cf::lock_acquire "map_data:$self->{path}";
1895 2156
1896 $self->{last_save} = $cf::RUNTIME; 2157 $self->{last_save} = $cf::RUNTIME;
1897 2158
1898 return unless $self->dirty; 2159 return unless $self->dirty;
1899 2160
1905 return if $self->{deny_save}; 2166 return if $self->{deny_save};
1906 2167
1907 local $self->{last_access} = $self->last_access;#d# 2168 local $self->{last_access} = $self->last_access;#d#
1908 2169
1909 cf::async { 2170 cf::async {
2171 $Coro::current->{desc} = "map player save";
1910 $_->contr->save for $self->players; 2172 $_->contr->save for $self->players;
1911 }; 2173 };
2174
2175 cf::get_slot 0.02;
1912 2176
1913 if ($uniq) { 2177 if ($uniq) {
1914 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2178 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1915 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2179 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1916 } else { 2180 } else {
1922 my ($self) = @_; 2186 my ($self) = @_;
1923 2187
1924 # save first because save cedes 2188 # save first because save cedes
1925 $self->save; 2189 $self->save;
1926 2190
1927 my $lock = cf::lock_acquire "map_data:" . $self->path; 2191 my $lock = cf::lock_acquire "map_data:$self->{path}";
1928 2192
1929 return if $self->players; 2193 return if $self->players;
1930 return if $self->in_memory != cf::MAP_IN_MEMORY; 2194 return if $self->in_memory != cf::MAP_ACTIVE;
1931 return if $self->{deny_save}; 2195 return if $self->{deny_save};
1932 2196
2197 $self->in_memory (cf::MAP_SWAPPED);
2198
2199 $self->deactivate;
2200 $_->clear_links_to ($self) for values %cf::MAP;
1933 $self->clear; 2201 $self->clear;
1934 $self->in_memory (cf::MAP_SWAPPED);
1935} 2202}
1936 2203
1937sub reset_at { 2204sub reset_at {
1938 my ($self) = @_; 2205 my ($self) = @_;
1939 2206
1971 if $uniq; 2238 if $uniq;
1972 } 2239 }
1973 2240
1974 delete $cf::MAP{$self->path}; 2241 delete $cf::MAP{$self->path};
1975 2242
2243 $self->deactivate;
2244 $_->clear_links_to ($self) for values %cf::MAP;
1976 $self->clear; 2245 $self->clear;
1977
1978 $_->clear_links_to ($self) for values %cf::MAP;
1979 2246
1980 $self->unlink_save; 2247 $self->unlink_save;
1981 $self->destroy; 2248 $self->destroy;
1982} 2249}
1983 2250
1984my $nuke_counter = "aaaa"; 2251my $nuke_counter = "aaaa";
1985 2252
1986sub nuke { 2253sub nuke {
1987 my ($self) = @_; 2254 my ($self) = @_;
1988 2255
2256 {
2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2258
1989 delete $cf::MAP{$self->path}; 2259 delete $cf::MAP{$self->path};
1990 2260
1991 $self->unlink_save; 2261 $self->unlink_save;
1992 2262
1993 bless $self, "cf::map"; 2263 bless $self, "cf::map";
1994 delete $self->{deny_reset}; 2264 delete $self->{deny_reset};
1995 $self->{deny_save} = 1; 2265 $self->{deny_save} = 1;
1996 $self->reset_timeout (1); 2266 $self->reset_timeout (1);
1997 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2267 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998 2268
1999 $cf::MAP{$self->path} = $self; 2269 $cf::MAP{$self->path} = $self;
2270 }
2000 2271
2001 $self->reset; # polite request, might not happen 2272 $self->reset; # polite request, might not happen
2002} 2273}
2003 2274
2004=item $maps = cf::map::tmp_maps 2275=item $maps = cf::map::tmp_maps
2046 2317
2047sub unique_maps() { 2318sub unique_maps() {
2048 [ 2319 [
2049 map { 2320 map {
2050 utf8::decode $_; 2321 utf8::decode $_;
2051 /\.map$/ 2322 s/\.map$//; # TODO future compatibility hack
2323 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2324 ? ()
2052 ? normalise $_ 2325 : normalise $_
2053 : ()
2054 } @{ aio_readdir $UNIQUEDIR or [] } 2326 } @{ aio_readdir $UNIQUEDIR or [] }
2055 ] 2327 ]
2056} 2328}
2057 2329
2058package cf;
2059
2060=back 2330=back
2061 2331
2062=head3 cf::object 2332=head3 cf::object
2063 2333
2064=cut 2334=cut
2067 2337
2068=over 4 2338=over 4
2069 2339
2070=item $ob->inv_recursive 2340=item $ob->inv_recursive
2071 2341
2072Returns the inventory of the object _and_ their inventories, recursively. 2342Returns the inventory of the object I<and> their inventories, recursively,
2343but I<not> the object itself.
2073 2344
2074=cut 2345=cut
2075 2346
2076sub inv_recursive_; 2347sub inv_recursive_;
2077sub inv_recursive_ { 2348sub inv_recursive_ {
2080 2351
2081sub inv_recursive { 2352sub inv_recursive {
2082 inv_recursive_ inv $_[0] 2353 inv_recursive_ inv $_[0]
2083} 2354}
2084 2355
2356=item $ref = $ob->ref
2357
2358Creates and returns a persistent reference to an object that can be stored as a string.
2359
2360=item $ob = cf::object::deref ($refstring)
2361
2362returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2363even if the object actually exists. May block.
2364
2365=cut
2366
2367sub deref {
2368 my ($ref) = @_;
2369
2370 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2371 my ($uuid, $name) = ($1, $2);
2372 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2373 or return;
2374 $pl->ob->uuid eq $uuid
2375 or return;
2376
2377 $pl->ob
2378 } else {
2379 warn "$ref: cannot resolve object reference\n";
2380 undef
2381 }
2382}
2383
2085package cf; 2384package cf;
2086 2385
2087=back 2386=back
2088 2387
2089=head3 cf::object::player 2388=head3 cf::object::player
2095Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2394Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2096can be C<undef>. Does the right thing when the player is currently in a 2395can be C<undef>. Does the right thing when the player is currently in a
2097dialogue with the given NPC character. 2396dialogue with the given NPC character.
2098 2397
2099=cut 2398=cut
2399
2400our $SAY_CHANNEL = {
2401 id => "say",
2402 title => "Map",
2403 reply => "say ",
2404 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2405};
2406
2407our $CHAT_CHANNEL = {
2408 id => "chat",
2409 title => "Chat",
2410 reply => "chat ",
2411 tooltip => "Player chat and shouts, global to the server.",
2412};
2100 2413
2101# rough implementation of a future "reply" method that works 2414# rough implementation of a future "reply" method that works
2102# with dialog boxes. 2415# with dialog boxes.
2103#TODO: the first argument must go, split into a $npc->reply_to ( method 2416#TODO: the first argument must go, split into a $npc->reply_to ( method
2104sub cf::object::player::reply($$$;$) { 2417sub cf::object::player::reply($$$;$) {
2111 2424
2112 } else { 2425 } else {
2113 my $pl = $self->contr; 2426 my $pl = $self->contr;
2114 2427
2115 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2428 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116 my $diag = $pl->{npc_dialog}; 2429 my $dialog = $pl->{npc_dialog};
2117 $diag->{pl}->ext_reply ( 2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2118 $diag->{id},
2119 msgtype => "reply",
2120 msg => $diag->{pl}->expand_cfpod ($msg),
2121 add_topics => []
2122 );
2123 2431
2124 } else { 2432 } else {
2125 $msg = $npc->name . " says: $msg" if $npc; 2433 $msg = $npc->name . " says: $msg" if $npc;
2126 $self->message ($msg, $flags); 2434 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2127 } 2435 }
2128 } 2436 }
2437}
2438
2439=item $object->send_msg ($channel, $msg, $color, [extra...])
2440
2441=cut
2442
2443sub cf::object::send_msg {
2444 my $pl = shift->contr
2445 or return;
2446 $pl->send_msg (@_);
2129} 2447}
2130 2448
2131=item $player_object->may ("access") 2449=item $player_object->may ("access")
2132 2450
2133Returns wether the given player is authorized to access resource "access" 2451Returns wether the given player is authorized to access resource "access"
2146 2464
2147=item $player_object->enter_link 2465=item $player_object->enter_link
2148 2466
2149Freezes the player and moves him/her to a special map (C<{link}>). 2467Freezes the player and moves him/her to a special map (C<{link}>).
2150 2468
2151The player should be reasonably safe there for short amounts of time. You 2469The player should be reasonably safe there for short amounts of time (e.g.
2152I<MUST> call C<leave_link> as soon as possible, though. 2470for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2471though, as the palyer cannot control the character while it is on the link
2472map.
2153 2473
2154Will never block. 2474Will never block.
2155 2475
2156=item $player_object->leave_link ($map, $x, $y) 2476=item $player_object->leave_link ($map, $x, $y)
2157 2477
2212 # use -1 or undef as default coordinates, not 0, 0 2532 # use -1 or undef as default coordinates, not 0, 0
2213 ($x, $y) = ($map->enter_x, $map->enter_y) 2533 ($x, $y) = ($map->enter_x, $map->enter_y)
2214 if $x <=0 && $y <= 0; 2534 if $x <=0 && $y <= 0;
2215 2535
2216 $map->load; 2536 $map->load;
2217 $map->load_diag; 2537 $map->load_neighbours;
2218 2538
2219 return unless $self->contr->active; 2539 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2220 $self->activate_recursive; 2541 $self->activate_recursive;
2221 2542
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2544 $self->enter_map ($map, $x, $y);
2224} 2545}
2225 2546
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227 2548
2228Moves the player to the given map-path and coordinates by first freezing 2549Moves the player to the given map-path and coordinates by first freezing
2229her, loading and preparing them map, calling the provided $check callback 2550her, loading and preparing them map, calling the provided $check callback
2230that has to return the map if sucecssful, and then unfreezes the player on 2551that has to return the map if sucecssful, and then unfreezes the player on
2231the new (success) or old (failed) map position. 2552the new (success) or old (failed) map position. In either case, $done will
2553be called at the end of this process.
2554
2555Note that $check will be called with a potentially non-loaded map, so if
2556it needs a loaded map it has to call C<< ->load >>.
2232 2557
2233=cut 2558=cut
2234 2559
2235our $GOTOGEN; 2560our $GOTOGEN;
2236 2561
2237sub cf::object::player::goto { 2562sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2563 my ($self, $path, $x, $y, $check, $done) = @_;
2239 2564
2240 # do generation counting so two concurrent goto's will be executed in-order 2565 # do generation counting so two concurrent goto's will be executed in-order
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2566 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2567
2243 $self->enter_link; 2568 $self->enter_link;
2244 2569
2245 (async { 2570 (async {
2571 $Coro::current->{desc} = "player::goto $path $x $y";
2572
2573 # *tag paths override both path and x|y
2574 if ($path =~ /^\*(.*)$/) {
2575 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2576 my $ob = $obs[rand @obs];
2577
2578 # see if we actually can go there
2579 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2580 $ob = $obs[rand @obs];
2581 } else {
2582 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2583 }
2584 # else put us there anyways for now #d#
2585
2586 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2587 } else {
2588 ($path, $x, $y) = (undef, undef, undef);
2589 }
2590 }
2591
2246 my $map = eval { 2592 my $map = eval {
2247 my $map = cf::map::find $path; 2593 my $map = defined $path ? cf::map::find $path : undef;
2248 2594
2249 if ($map) { 2595 if ($map) {
2250 $map = $map->customise_for ($self); 2596 $map = $map->customise_for ($self);
2251 $map = $check->($map) if $check && $map; 2597 $map = $check->($map) if $check && $map;
2252 } else { 2598 } else {
2253 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2599 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2254 } 2600 }
2255 2601
2256 $map 2602 $map
2257 }; 2603 };
2258 2604
2263 2609
2264 if ($gen == $self->{_goto_generation}) { 2610 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2611 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2612 $self->leave_link ($map, $x, $y);
2267 } 2613 }
2614
2615 $done->() if $done;
2268 })->prio (1); 2616 })->prio (1);
2269} 2617}
2270 2618
2271=item $player_object->enter_exit ($exit_object) 2619=item $player_object->enter_exit ($exit_object)
2272 2620
2292} 2640}
2293 2641
2294sub prepare_random_map { 2642sub prepare_random_map {
2295 my ($exit) = @_; 2643 my ($exit) = @_;
2296 2644
2297 my $guard = cf::lock_acquire "exit_prepare:$exit";
2298
2299 # all this does is basically replace the /! path by 2645 # all this does is basically replace the /! path by
2300 # a new random map path (?random/...) with a seed 2646 # a new random map path (?random/...) with a seed
2301 # that depends on the exit object 2647 # that depends on the exit object
2302 2648
2303 my $rmp = parse_random_map_params $exit->msg; 2649 my $rmp = parse_random_map_params $exit->msg;
2305 if ($exit->map) { 2651 if ($exit->map) {
2306 $rmp->{region} = $exit->region->name; 2652 $rmp->{region} = $exit->region->name;
2307 $rmp->{origin_map} = $exit->map->path; 2653 $rmp->{origin_map} = $exit->map->path;
2308 $rmp->{origin_x} = $exit->x; 2654 $rmp->{origin_x} = $exit->x;
2309 $rmp->{origin_y} = $exit->y; 2655 $rmp->{origin_y} = $exit->y;
2656
2657 $exit->map->touch;
2310 } 2658 }
2311 2659
2312 $rmp->{random_seed} ||= $exit->random_seed; 2660 $rmp->{random_seed} ||= $exit->random_seed;
2313 2661
2314 my $data = cf::to_json $rmp; 2662 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2315 my $md5 = Digest::MD5::md5_hex $data; 2663 my $md5 = Digest::MD5::md5_hex $data;
2316 my $meta = "$RANDOMDIR/$md5.meta"; 2664 my $meta = "$RANDOMDIR/$md5.meta";
2317 2665
2318 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2666 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2319 aio_write $fh, 0, (length $data), $data, 0; 2667 aio_write $fh, 0, (length $data), $data, 0;
2320 undef $fh; 2668 undef $fh;
2321 aio_rename "$meta~", $meta; 2669 aio_rename "$meta~", $meta;
2322 2670
2671 my $slaying = "?random/$md5";
2672
2673 if ($exit->valid) {
2323 $exit->slaying ("?random/$md5"); 2674 $exit->slaying ("?random/$md5");
2324 $exit->msg (undef); 2675 $exit->msg (undef);
2676 }
2325 } 2677 }
2326} 2678}
2327 2679
2328sub cf::object::player::enter_exit { 2680sub cf::object::player::enter_exit {
2329 my ($self, $exit) = @_; 2681 my ($self, $exit) = @_;
2330 2682
2331 return unless $self->type == cf::PLAYER; 2683 return unless $self->type == cf::PLAYER;
2332 2684
2333 if ($exit->slaying eq "/!") {
2334 #TODO: this should de-fi-ni-te-ly not be a sync-job
2335 # the problem is that $exit might not survive long enough
2336 # so it needs to be done right now, right here
2337 cf::sync_job { prepare_random_map $exit };
2338 }
2339
2340 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2341 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp;
2343
2344 $self->enter_link; 2685 $self->enter_link;
2345 2686
2346 (async { 2687 (async {
2347 $self->deactivate_recursive; # just to be sure 2688 $Coro::current->{desc} = "enter_exit";
2689
2348 unless (eval { 2690 unless (eval {
2691 $self->deactivate_recursive; # just to be sure
2692
2693 # random map handling
2694 {
2695 my $guard = cf::lock_acquire "exit_prepare:$exit";
2696
2697 prepare_random_map $exit
2698 if $exit->slaying eq "/!";
2699 }
2700
2701 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2702 my $x = $exit->stats->hp;
2703 my $y = $exit->stats->sp;
2704
2349 $self->goto ($slaying, $hp, $sp); 2705 $self->goto ($map, $x, $y);
2350 2706
2707 # if exit is damned, update players death & WoR home-position
2708 $self->contr->savebed ($map, $x, $y)
2709 if $exit->flag (cf::FLAG_DAMNED);
2710
2351 1; 2711 1
2352 }) { 2712 }) {
2353 $self->message ("Something went wrong deep within the crossfire server. " 2713 $self->message ("Something went wrong deep within the deliantra server. "
2354 . "I'll try to bring you back to the map you were before. " 2714 . "I'll try to bring you back to the map you were before. "
2355 . "Please report this to the dungeon master!", 2715 . "Please report this to the dungeon master!",
2356 cf::NDI_UNIQUE | cf::NDI_RED); 2716 cf::NDI_UNIQUE | cf::NDI_RED);
2357 2717
2358 warn "ERROR in enter_exit: $@"; 2718 warn "ERROR in enter_exit: $@";
2377 2737
2378 utf8::encode $text; 2738 utf8::encode $text;
2379 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2380} 2740}
2381 2741
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 2742=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 2743
2384Send a drawinfo or msg packet to the client, formatting the msg for the 2744Send a drawinfo or msg packet to the client, formatting the msg for the
2385client if neccessary. C<$type> should be a string identifying the type of 2745client if neccessary. C<$type> should be a string identifying the type of
2386the message, with C<log> being the default. If C<$color> is negative, suppress 2746the message, with C<log> being the default. If C<$color> is negative, suppress
2387the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2388 2748
2389=cut 2749=cut
2390 2750
2751# non-persistent channels (usually the info channel)
2752our %CHANNEL = (
2753 "c/identify" => {
2754 id => "infobox",
2755 title => "Identify",
2756 reply => undef,
2757 tooltip => "Items recently identified",
2758 },
2759 "c/examine" => {
2760 id => "infobox",
2761 title => "Examine",
2762 reply => undef,
2763 tooltip => "Signs and other items you examined",
2764 },
2765 "c/book" => {
2766 id => "infobox",
2767 title => "Book",
2768 reply => undef,
2769 tooltip => "The contents of a note or book",
2770 },
2771 "c/lookat" => {
2772 id => "infobox",
2773 title => "Look",
2774 reply => undef,
2775 tooltip => "What you saw there",
2776 },
2777 "c/who" => {
2778 id => "infobox",
2779 title => "Players",
2780 reply => undef,
2781 tooltip => "Shows players who are currently online",
2782 },
2783 "c/body" => {
2784 id => "infobox",
2785 title => "Body Parts",
2786 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available",
2788 },
2789 "c/uptime" => {
2790 id => "infobox",
2791 title => "Uptime",
2792 reply => undef,
2793 tooltip => "How long the server has been running since last restart",
2794 },
2795 "c/mapinfo" => {
2796 id => "infobox",
2797 title => "Map Info",
2798 reply => undef,
2799 tooltip => "Information related to the maps",
2800 },
2801 "c/party" => {
2802 id => "party",
2803 title => "Party",
2804 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party",
2806 },
2807);
2808
2391sub cf::client::send_msg { 2809sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 2810 my ($self, $channel, $msg, $color, @extra) = @_;
2393 2811
2394 $msg = $self->pl->expand_cfpod ($msg); 2812 $msg = $self->pl->expand_cfpod ($msg)
2813 unless $color & cf::NDI_VERBATIM;
2814
2815 $color &= cf::NDI_CLIENT_MASK; # just in case...
2816
2817 # check predefined channels, for the benefit of C
2818 if ($CHANNEL{$channel}) {
2819 $channel = $CHANNEL{$channel};
2820
2821 $self->ext_msg (channel_info => $channel)
2822 if $self->can_msg;
2823
2824 $channel = $channel->{id};
2825
2826 } elsif (ref $channel) {
2827 # send meta info to client, if not yet sent
2828 unless (exists $self->{channel}{$channel->{id}}) {
2829 $self->{channel}{$channel->{id}} = $channel;
2830 $self->ext_msg (channel_info => $channel)
2831 if $self->can_msg;
2832 }
2833
2834 $channel = $channel->{id};
2835 }
2836
2837 return unless @extra || length $msg;
2395 2838
2396 if ($self->can_msg) { 2839 if ($self->can_msg) {
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2840 # default colour, mask it out
2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2842 if $color & cf::NDI_DEF;
2843
2844 my $pkt = "msg "
2845 . $self->{json_coder}->encode (
2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 );
2848
2849 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf};
2852
2853 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag";
2857 }
2858
2859 $self->send_packet ($pkt);
2398 } else { 2860 } else {
2399 # replace some tags by gcfclient-compatible ones
2400 for ($msg) {
2401 1 while
2402 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2403 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2404 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2405 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2406 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2407 }
2408
2409 if ($color >= 0) { 2861 if ($color >= 0) {
2862 # replace some tags by gcfclient-compatible ones
2863 for ($msg) {
2864 1 while
2865 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2866 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2867 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2868 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2869 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2870 }
2871
2872 $color &= cf::NDI_COLOR_MASK;
2873
2874 utf8::encode $msg;
2875
2410 if (0 && $msg =~ /\[/) { 2876 if (0 && $msg =~ /\[/) {
2877 # COMMAND/INFO
2411 $self->send_packet ("drawextinfo $color 4 0 $msg") 2878 $self->send_packet ("drawextinfo $color 10 8 $msg")
2412 } else { 2879 } else {
2413 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2880 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414 $self->send_packet ("drawinfo $color $msg") 2881 $self->send_packet ("drawinfo $color $msg")
2415 } 2882 }
2416 } 2883 }
2417 } 2884 }
2418} 2885}
2419 2886
2420=item $client->ext_event ($type, %msg) 2887=item $client->ext_msg ($type, @msg)
2421 2888
2422Sends an ext event to the client. 2889Sends an ext event to the client.
2423 2890
2424=cut 2891=cut
2425 2892
2426sub cf::client::ext_event($$%) { 2893sub cf::client::ext_msg($$@) {
2427 my ($self, $type, %msg) = @_; 2894 my ($self, $type, @msg) = @_;
2428 2895
2896 if ($self->extcmd == 2) {
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2898 } elsif ($self->extcmd == 1) { # TODO: remove
2429 $msg{msgtype} = "event_$type"; 2899 push @msg, msgtype => "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%msg); 2900 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2901 }
2902}
2903
2904=item $client->ext_reply ($msgid, @msg)
2905
2906Sends an ext reply to the client.
2907
2908=cut
2909
2910sub cf::client::ext_reply($$@) {
2911 my ($self, $id, @msg) = @_;
2912
2913 if ($self->extcmd == 2) {
2914 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2915 } elsif ($self->extcmd == 1) {
2916 #TODO: version 1, remove
2917 unshift @msg, msgtype => "reply", msgid => $id;
2918 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2919 }
2431} 2920}
2432 2921
2433=item $success = $client->query ($flags, "text", \&cb) 2922=item $success = $client->query ($flags, "text", \&cb)
2434 2923
2435Queues a query to the client, calling the given callback with 2924Queues a query to the client, calling the given callback with
2458 2947
2459 1 2948 1
2460} 2949}
2461 2950
2462cf::client->attach ( 2951cf::client->attach (
2952 on_connect => sub {
2953 my ($ns) = @_;
2954
2955 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2956 },
2463 on_reply => sub { 2957 on_reply => sub {
2464 my ($ns, $msg) = @_; 2958 my ($ns, $msg) = @_;
2465 2959
2466 # this weird shuffling is so that direct followup queries 2960 # this weird shuffling is so that direct followup queries
2467 # get handled first 2961 # get handled first
2482 } 2976 }
2483 }, 2977 },
2484 on_exticmd => sub { 2978 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 2979 my ($ns, $buf) = @_;
2486 2980
2487 my $msg = eval { from_json $buf }; 2981 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 2982
2489 if (ref $msg) { 2983 if (ref $msg) {
2984 my ($type, $reply, @payload) =
2985 "ARRAY" eq ref $msg
2986 ? @$msg
2987 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2988
2989 my @reply;
2990
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2991 if (my $cb = $EXTICMD{$type}) {
2491 if (my %reply = $cb->($ns, $msg)) { 2992 @reply = $cb->($ns, @payload);
2492 $reply{msgid} = $msg->{msgid};
2493 $ns->send ("ext " . cf::to_json \%reply);
2494 }
2495 } 2993 }
2994
2995 $ns->ext_reply ($reply, @reply)
2996 if $reply;
2997
2496 } else { 2998 } else {
2497 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2999 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498 } 3000 }
2499 3001
2500 cf::override; 3002 cf::override;
2547our $safe = new Safe "safe"; 3049our $safe = new Safe "safe";
2548our $safe_hole = new Safe::Hole; 3050our $safe_hole = new Safe::Hole;
2549 3051
2550$SIG{FPE} = 'IGNORE'; 3052$SIG{FPE} = 'IGNORE';
2551 3053
2552$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3054$safe->permit_only (Opcode::opset qw(
3055 :base_core :base_mem :base_orig :base_math
3056 grepstart grepwhile mapstart mapwhile
3057 sort time
3058));
2553 3059
2554# here we export the classes and methods available to script code 3060# here we export the classes and methods available to script code
2555 3061
2556=pod 3062=pod
2557 3063
2558The following functions and methods are available within a safe environment: 3064The following functions and methods are available within a safe environment:
2559 3065
2560 cf::object contr pay_amount pay_player map 3066 cf::object
3067 contr pay_amount pay_player map x y force_find force_add destroy
3068 insert remove name archname title slaying race decrease split
3069
2561 cf::object::player player 3070 cf::object::player
2562 cf::player peaceful 3071 player
2563 cf::map trigger 3072
3073 cf::player
3074 peaceful
3075
3076 cf::map
3077 trigger
2564 3078
2565=cut 3079=cut
2566 3080
2567for ( 3081for (
2568 ["cf::object" => qw(contr pay_amount pay_player map)], 3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3083 insert remove inv nrof name archname title slaying race
3084 decrease split destroy change_exp)],
2569 ["cf::object::player" => qw(player)], 3085 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 3086 ["cf::player" => qw(peaceful)],
2571 ["cf::map" => qw(trigger)], 3087 ["cf::map" => qw(trigger)],
2572) { 3088) {
2573 no strict 'refs'; 3089 no strict 'refs';
2649# the server's init and main functions 3165# the server's init and main functions
2650 3166
2651sub load_facedata($) { 3167sub load_facedata($) {
2652 my ($path) = @_; 3168 my ($path) = @_;
2653 3169
3170 # HACK to clear player env face cache, we need some signal framework
3171 # for this (global event?)
3172 %ext::player_env::MUSIC_FACE_CACHE = ();
3173
3174 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3175
2654 warn "loading facedata from $path\n"; 3176 warn "loading facedata from $path\n";
2655 3177
2656 my $facedata; 3178 my $facedata;
2657 0 < aio_load $path, $facedata 3179 0 < aio_load $path, $facedata
2658 or die "$path: $!"; 3180 or die "$path: $!";
2660 $facedata = Coro::Storable::thaw $facedata; 3182 $facedata = Coro::Storable::thaw $facedata;
2661 3183
2662 $facedata->{version} == 2 3184 $facedata->{version} == 2
2663 or cf::cleanup "$path: version mismatch, cannot proceed."; 3185 or cf::cleanup "$path: version mismatch, cannot proceed.";
2664 3186
3187 # patch in the exptable
3188 $facedata->{resource}{"res/exp_table"} = {
3189 type => FT_RSRC,
3190 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3191 };
3192 cf::cede_to_tick;
3193
2665 { 3194 {
2666 my $faces = $facedata->{faceinfo}; 3195 my $faces = $facedata->{faceinfo};
2667 3196
2668 while (my ($face, $info) = each %$faces) { 3197 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3198 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3199
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3200 cf::face::set_visibility $idx, $info->{visibility};
3201 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3202 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3203 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673 Coro::cede; 3204
3205 cf::cede_to_tick;
2674 } 3206 }
2675 3207
2676 while (my ($face, $info) = each %$faces) { 3208 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 3209 next unless $info->{smooth};
3210
2678 my $idx = cf::face::find $face 3211 my $idx = cf::face::find $face
2679 or next; 3212 or next;
3213
2680 if (my $smooth = cf::face::find $info->{smooth}) { 3214 if (my $smooth = cf::face::find $info->{smooth}) {
3215 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3216 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 3217 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3218 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 3219 }
2685 Coro::cede; 3220
3221 cf::cede_to_tick;
2686 } 3222 }
2687 } 3223 }
2688 3224
2689 { 3225 {
2690 my $anims = $facedata->{animinfo}; 3226 my $anims = $facedata->{animinfo};
2691 3227
2692 while (my ($anim, $info) = each %$anims) { 3228 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3229 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 3230 cf::cede_to_tick;
2695 } 3231 }
2696 3232
2697 cf::anim::invalidate_all; # d'oh 3233 cf::anim::invalidate_all; # d'oh
2698 } 3234 }
2699 3235
3236 {
3237 # TODO: for gcfclient pleasure, we should give resources
3238 # that gcfclient doesn't grok a >10000 face index.
3239 my $res = $facedata->{resource};
3240
3241 while (my ($name, $info) = each %$res) {
3242 if (defined $info->{type}) {
3243 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3244 my $data;
3245
3246 if ($info->{type} & 1) {
3247 # prepend meta info
3248
3249 my $meta = $enc->encode ({
3250 name => $name,
3251 %{ $info->{meta} || {} },
3252 });
3253
3254 $data = pack "(w/a*)*", $meta, $info->{data};
3255 } else {
3256 $data = $info->{data};
3257 }
3258
3259 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3260 cf::face::set_type $idx, $info->{type};
3261 } else {
3262 $RESOURCE{$name} = $info;
3263 }
3264
3265 cf::cede_to_tick;
3266 }
3267 }
3268
3269 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3270
2700 1 3271 1
2701} 3272}
2702 3273
3274cf::global->attach (on_resource_update => sub {
3275 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3276 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3277
3278 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3279 my $sound = $soundconf->{compat}[$_]
3280 or next;
3281
3282 my $face = cf::face::find "sound/$sound->[1]";
3283 cf::sound::set $sound->[0] => $face;
3284 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3285 }
3286
3287 while (my ($k, $v) = each %{$soundconf->{event}}) {
3288 my $face = cf::face::find "sound/$v";
3289 cf::sound::set $k => $face;
3290 }
3291 }
3292});
3293
3294register_exticmd fx_want => sub {
3295 my ($ns, $want) = @_;
3296
3297 while (my ($k, $v) = each %$want) {
3298 $ns->fx_want ($k, $v);
3299 }
3300};
3301
3302sub load_resource_file($) {
3303 my $guard = lock_acquire "load_resource_file";
3304
3305 my $status = load_resource_file_ $_[0];
3306 get_slot 0.1, 100;
3307 cf::arch::commit_load;
3308
3309 $status
3310}
3311
2703sub reload_regions { 3312sub reload_regions {
3313 # HACK to clear player env face cache, we need some signal framework
3314 # for this (global event?)
3315 %ext::player_env::MUSIC_FACE_CACHE = ();
3316
2704 load_resource_file "$MAPDIR/regions" 3317 load_resource_file "$MAPDIR/regions"
2705 or die "unable to load regions file\n"; 3318 or die "unable to load regions file\n";
3319
3320 for (cf::region::list) {
3321 $_->{match} = qr/$_->{match}/
3322 if exists $_->{match};
3323 }
2706} 3324}
2707 3325
2708sub reload_facedata { 3326sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 3327 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 3328 or die "unable to load facedata\n";
2721} 3339}
2722 3340
2723sub reload_resources { 3341sub reload_resources {
2724 warn "reloading resource files...\n"; 3342 warn "reloading resource files...\n";
2725 3343
3344 reload_facedata;
3345 reload_archetypes;
2726 reload_regions; 3346 reload_regions;
2727 reload_facedata;
2728 #reload_archetypes;#d#
2729 reload_archetypes;
2730 reload_treasures; 3347 reload_treasures;
2731 3348
2732 warn "finished reloading resource files\n"; 3349 warn "finished reloading resource files\n";
2733} 3350}
2734 3351
2735sub init { 3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
2736 reload_resources; 3357 reload_resources;
2737} 3358}
2738 3359
2739sub cfg_load { 3360sub reload_config {
2740 open my $fh, "<:utf8", "$CONFDIR/config" 3361 open my $fh, "<:utf8", "$CONFDIR/config"
2741 or return; 3362 or return;
2742 3363
2743 local $/; 3364 local $/;
2744 *CFG = YAML::Syck::Load <$fh>; 3365 *CFG = YAML::Load <$fh>;
2745 3366
2746 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3367 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2747 3368
2748 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3369 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2749 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3370 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2755 }; 3376 };
2756 warn $@ if $@; 3377 warn $@ if $@;
2757 } 3378 }
2758} 3379}
2759 3380
3381sub pidfile() {
3382 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3383 or die "$PIDFILE: $!";
3384 flock $fh, &Fcntl::LOCK_EX
3385 or die "$PIDFILE: flock: $!";
3386 $fh
3387}
3388
3389# make sure only one server instance is running at any one time
3390sub atomic {
3391 my $fh = pidfile;
3392
3393 my $pid = <$fh>;
3394 kill 9, $pid if $pid > 0;
3395
3396 seek $fh, 0, 0;
3397 print $fh $$;
3398}
3399
2760sub main { 3400sub main {
3401 atomic;
3402
2761 # we must not ever block the main coroutine 3403 # we must not ever block the main coroutine
2762 local $Coro::idle = sub { 3404 local $Coro::idle = sub {
2763 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2764 (async { 3406 (async {
2765 Event::one_event; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT;
2766 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
2767 }; 3410 };
2768 3411
2769 cfg_load; 3412 {
3413 my $guard = freeze_mainloop;
3414 reload_config;
2770 db_init; 3415 db_init;
2771 load_extensions; 3416 load_extensions;
2772 3417
2773 $TICK_WATCHER->start; 3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 }
3420
3421 utime time, time, $RUNTIMEFILE;
3422
3423 # no (long-running) fork's whatsoever before this point(!)
3424 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3425
2774 Event::loop; 3426 EV::loop;
2775} 3427}
2776 3428
2777############################################################################# 3429#############################################################################
2778# initialisation and cleanup 3430# initialisation and cleanup
2779 3431
2780# install some emergency cleanup handlers 3432# install some emergency cleanup handlers
2781BEGIN { 3433BEGIN {
3434 our %SIGWATCHER = ();
2782 for my $signal (qw(INT HUP TERM)) { 3435 for my $signal (qw(INT HUP TERM)) {
2783 Event->signal ( 3436 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2784 reentrant => 0,
2785 data => WF_AUTOCANCEL,
2786 signal => $signal,
2787 prio => 0,
2788 cb => sub {
2789 cf::cleanup "SIG$signal"; 3437 cf::cleanup "SIG$signal";
2790 },
2791 ); 3438 };
2792 } 3439 }
2793} 3440}
2794 3441
2795sub write_runtime { 3442sub write_runtime_sync {
2796 my $runtime = "$LOCALDIR/runtime";
2797
2798 # first touch the runtime file to show we are still running: 3443 # first touch the runtime file to show we are still running:
2799 # the fsync below can take a very very long time. 3444 # the fsync below can take a very very long time.
2800 3445
2801 IO::AIO::aio_utime $runtime, undef, undef; 3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2802 3447
2803 my $guard = cf::lock_acquire "write_runtime"; 3448 my $guard = cf::lock_acquire "write_runtime";
2804 3449
2805 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2806 or return; 3451 or return;
2807 3452
2808 my $value = $cf::RUNTIME + 90 + 10; 3453 my $value = $cf::RUNTIME + 90 + 10;
2809 # 10 is the runtime save interval, for a monotonic clock 3454 # 10 is the runtime save interval, for a monotonic clock
2810 # 60 allows for the watchdog to kill the server. 3455 # 60 allows for the watchdog to kill the server.
2820 aio_utime $fh, undef, undef; 3465 aio_utime $fh, undef, undef;
2821 3466
2822 close $fh 3467 close $fh
2823 or return; 3468 or return;
2824 3469
2825 aio_rename "$runtime~", $runtime 3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2826 and return; 3471 and return;
2827 3472
2828 warn "runtime file written.\n"; 3473 warn "runtime file written.\n";
2829 3474
2830 1 3475 1
3476}
3477
3478our $uuid_lock;
3479our $uuid_skip;
3480
3481sub write_uuid_sync($) {
3482 $uuid_skip ||= $_[0];
3483
3484 return if $uuid_lock;
3485 local $uuid_lock = 1;
3486
3487 my $uuid = "$LOCALDIR/uuid";
3488
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return;
3491
3492 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3493 $uuid_skip = 0;
3494
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return;
3497
3498 # always fsync - this file is important
3499 aio_fsync $fh
3500 and return;
3501
3502 close $fh
3503 or return;
3504
3505 aio_rename "$uuid~", $uuid
3506 and return;
3507
3508 warn "uuid file written ($value).\n";
3509
3510 1
3511
3512}
3513
3514sub write_uuid($$) {
3515 my ($skip, $sync) = @_;
3516
3517 $sync ? write_uuid_sync $skip
3518 : async { write_uuid_sync $skip };
2831} 3519}
2832 3520
2833sub emergency_save() { 3521sub emergency_save() {
2834 my $freeze_guard = cf::freeze_mainloop; 3522 my $freeze_guard = cf::freeze_mainloop;
2835 3523
2841 # and maps saved/destroyed asynchronously. 3529 # and maps saved/destroyed asynchronously.
2842 warn "begin emergency player save\n"; 3530 warn "begin emergency player save\n";
2843 for my $login (keys %cf::PLAYER) { 3531 for my $login (keys %cf::PLAYER) {
2844 my $pl = $cf::PLAYER{$login} or next; 3532 my $pl = $cf::PLAYER{$login} or next;
2845 $pl->valid or next; 3533 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2846 $pl->save; 3535 $pl->save;
2847 } 3536 }
2848 warn "end emergency player save\n"; 3537 warn "end emergency player save\n";
2849 3538
2850 warn "begin emergency map save\n"; 3539 warn "begin emergency map save\n";
2856 warn "end emergency map save\n"; 3545 warn "end emergency map save\n";
2857 3546
2858 warn "begin emergency database checkpoint\n"; 3547 warn "begin emergency database checkpoint\n";
2859 BDB::db_env_txn_checkpoint $DB_ENV; 3548 BDB::db_env_txn_checkpoint $DB_ENV;
2860 warn "end emergency database checkpoint\n"; 3549 warn "end emergency database checkpoint\n";
3550
3551 warn "begin write uuid\n";
3552 write_uuid_sync 1;
3553 warn "end write uuid\n";
2861 }; 3554 };
2862 3555
2863 warn "leave emergency perl save\n"; 3556 warn "leave emergency perl save\n";
2864} 3557}
2865 3558
2866sub post_cleanup { 3559sub post_cleanup {
2867 my ($make_core) = @_; 3560 my ($make_core) = @_;
2868 3561
2869 warn Carp::longmess "post_cleanup backtrace" 3562 warn Carp::longmess "post_cleanup backtrace"
2870 if $make_core; 3563 if $make_core;
3564
3565 my $fh = pidfile;
3566 unlink $PIDFILE if <$fh> == $$;
2871} 3567}
3568
3569# a safer delete_package, copied from Symbol
3570sub clear_package($) {
3571 my $pkg = shift;
3572
3573 # expand to full symbol table name if needed
3574 unless ($pkg =~ /^main::.*::$/) {
3575 $pkg = "main$pkg" if $pkg =~ /^::/;
3576 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3577 $pkg .= '::' unless $pkg =~ /::$/;
3578 }
3579
3580 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3581 my $stem_symtab = *{$stem}{HASH};
3582
3583 defined $stem_symtab and exists $stem_symtab->{$leaf}
3584 or return;
3585
3586 # clear all symbols
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 }
3592 warn "cleared package #$pkg\n";#d#
3593}
3594
3595our $RELOAD; # how many times to reload
2872 3596
2873sub do_reload_perl() { 3597sub do_reload_perl() {
2874 # can/must only be called in main 3598 # can/must only be called in main
2875 if ($Coro::current != $Coro::main) { 3599 if ($Coro::current != $Coro::main) {
2876 warn "can only reload from main coroutine"; 3600 warn "can only reload from main coroutine";
2877 return; 3601 return;
2878 } 3602 }
2879 3603
3604 return if $RELOAD++;
3605
3606 while ($RELOAD) {
2880 warn "reloading..."; 3607 warn "reloading...";
2881 3608
2882 warn "entering sync_job"; 3609 warn "entering sync_job";
2883 3610
2884 cf::sync_job { 3611 cf::sync_job {
2885 cf::write_runtime; # external watchdog should not bark 3612 cf::write_runtime_sync; # external watchdog should not bark
2886 cf::emergency_save; 3613 cf::emergency_save;
2887 cf::write_runtime; # external watchdog should not bark 3614 cf::write_runtime_sync; # external watchdog should not bark
2888 3615
2889 warn "syncing database to disk"; 3616 warn "syncing database to disk";
2890 BDB::db_env_txn_checkpoint $DB_ENV; 3617 BDB::db_env_txn_checkpoint $DB_ENV;
2891 3618
2892 # if anything goes wrong in here, we should simply crash as we already saved 3619 # if anything goes wrong in here, we should simply crash as we already saved
2893 3620
2894 warn "cancelling all WF_AUTOCANCEL watchers";
2895 for (Event::all_watchers) {
2896 $_->cancel if $_->data & WF_AUTOCANCEL;
2897 }
2898
2899 warn "flushing outstanding aio requests"; 3621 warn "flushing outstanding aio requests";
2900 for (;;) {
2901 BDB::flush;
2902 IO::AIO::flush;
2903 Coro::cede;
2904 last unless IO::AIO::nreqs || BDB::nreqs; 3622 while (IO::AIO::nreqs || BDB::nreqs) {
2905 warn "iterate..."; 3623 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2906 }
2907
2908 ++$RELOAD;
2909
2910 warn "cancelling all extension coros";
2911 $_->cancel for values %EXT_CORO;
2912 %EXT_CORO = ();
2913
2914 warn "removing commands";
2915 %COMMAND = ();
2916
2917 warn "removing ext/exti commands";
2918 %EXTCMD = ();
2919 %EXTICMD = ();
2920
2921 warn "unloading/nuking all extensions";
2922 for my $pkg (@EXTS) {
2923 warn "... unloading $pkg";
2924
2925 if (my $cb = $pkg->can ("unload")) {
2926 eval {
2927 $cb->($pkg);
2928 1
2929 } or warn "$pkg unloaded, but with errors: $@";
2930 } 3624 }
2931 3625
2932 warn "... nuking $pkg"; 3626 warn "cancelling all extension coros";
2933 Symbol::delete_package $pkg; 3627 $_->cancel for values %EXT_CORO;
2934 } 3628 %EXT_CORO = ();
2935 3629
2936 warn "unloading all perl modules loaded from $LIBDIR"; 3630 warn "removing commands";
2937 while (my ($k, $v) = each %INC) { 3631 %COMMAND = ();
2938 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2939 3632
3633 warn "removing ext/exti commands";
3634 %EXTCMD = ();
3635 %EXTICMD = ();
3636
3637 warn "unloading/nuking all extensions";
3638 for my $pkg (@EXTS) {
2940 warn "... unloading $k"; 3639 warn "... unloading $pkg";
2941 delete $INC{$k};
2942 3640
2943 $k =~ s/\.pm$//;
2944 $k =~ s/\//::/g;
2945
2946 if (my $cb = $k->can ("unload_module")) { 3641 if (my $cb = $pkg->can ("unload")) {
3642 eval {
2947 $cb->(); 3643 $cb->($pkg);
3644 1
3645 } or warn "$pkg unloaded, but with errors: $@";
3646 }
3647
3648 warn "... clearing $pkg";
3649 clear_package $pkg;
2948 } 3650 }
2949 3651
2950 Symbol::delete_package $k; 3652 warn "unloading all perl modules loaded from $LIBDIR";
3653 while (my ($k, $v) = each %INC) {
3654 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3655
3656 warn "... unloading $k";
3657 delete $INC{$k};
3658
3659 $k =~ s/\.pm$//;
3660 $k =~ s/\//::/g;
3661
3662 if (my $cb = $k->can ("unload_module")) {
3663 $cb->();
3664 }
3665
3666 clear_package $k;
2951 } 3667 }
2952 3668
2953 warn "getting rid of safe::, as good as possible"; 3669 warn "getting rid of safe::, as good as possible";
2954 Symbol::delete_package "safe::$_" 3670 clear_package "safe::$_"
2955 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3671 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2956 3672
2957 warn "unloading cf.pm \"a bit\""; 3673 warn "unloading cf.pm \"a bit\"";
2958 delete $INC{"cf.pm"}; 3674 delete $INC{"cf.pm"};
2959 delete $INC{"cf/pod.pm"}; 3675 delete $INC{"cf/pod.pm"};
2960 3676
2961 # don't, removes xs symbols, too, 3677 # don't, removes xs symbols, too,
2962 # and global variables created in xs 3678 # and global variables created in xs
2963 #Symbol::delete_package __PACKAGE__; 3679 #clear_package __PACKAGE__;
2964 3680
2965 warn "unload completed, starting to reload now"; 3681 warn "unload completed, starting to reload now";
2966 3682
2967 warn "reloading cf.pm"; 3683 warn "reloading cf.pm";
2968 require cf; 3684 require cf;
2969 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2970 3686
2971 warn "loading config and database again"; 3687 warn "loading config and database again";
2972 cf::cfg_load; 3688 cf::reload_config;
2973 3689
2974 warn "loading extensions"; 3690 warn "loading extensions";
2975 cf::load_extensions; 3691 cf::load_extensions;
2976 3692
2977 warn "reattaching attachments to objects/players"; 3693 warn "reattaching attachments to objects/players";
2978 _global_reattach; # objects, sockets 3694 _global_reattach; # objects, sockets
2979 warn "reattaching attachments to maps"; 3695 warn "reattaching attachments to maps";
2980 reattach $_ for values %MAP; 3696 reattach $_ for values %MAP;
2981 warn "reattaching attachments to players"; 3697 warn "reattaching attachments to players";
2982 reattach $_ for values %PLAYER; 3698 reattach $_ for values %PLAYER;
2983 3699
2984 warn "leaving sync_job"; 3700 warn "leaving sync_job";
2985 3701
2986 1 3702 1
2987 } or do { 3703 } or do {
2988 warn $@; 3704 warn $@;
2989 warn "error while reloading, exiting."; 3705 cf::cleanup "error while reloading, exiting.";
2990 exit 1;
2991 }; 3706 };
2992 3707
2993 warn "reloaded"; 3708 warn "reloaded";
3709 --$RELOAD;
3710 }
2994}; 3711};
2995 3712
2996our $RELOAD_WATCHER; # used only during reload 3713our $RELOAD_WATCHER; # used only during reload
2997 3714
2998sub reload_perl() { 3715sub reload_perl() {
2999 # doing reload synchronously and two reloads happen back-to-back, 3716 # doing reload synchronously and two reloads happen back-to-back,
3000 # coro crashes during coro_state_free->destroy here. 3717 # coro crashes during coro_state_free->destroy here.
3001 3718
3002 $RELOAD_WATCHER ||= Event->timer ( 3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3003 reentrant => 0,
3004 after => 0,
3005 data => WF_AUTOCANCEL,
3006 cb => sub {
3007 do_reload_perl; 3720 do_reload_perl;
3008 undef $RELOAD_WATCHER; 3721 undef $RELOAD_WATCHER;
3009 },
3010 ); 3722 };
3011} 3723}
3012 3724
3013register_command "reload" => sub { 3725register_command "reload" => sub {
3014 my ($who, $arg) = @_; 3726 my ($who, $arg) = @_;
3015 3727
3016 if ($who->flag (FLAG_WIZ)) { 3728 if ($who->flag (FLAG_WIZ)) {
3017 $who->message ("reloading server."); 3729 $who->message ("reloading server.");
3730 async {
3731 $Coro::current->{desc} = "perl_reload";
3018 async { reload_perl }; 3732 reload_perl;
3733 };
3019 } 3734 }
3020}; 3735};
3021 3736
3022unshift @INC, $LIBDIR; 3737unshift @INC, $LIBDIR;
3023 3738
3025 3740
3026our @WAIT_FOR_TICK; 3741our @WAIT_FOR_TICK;
3027our @WAIT_FOR_TICK_BEGIN; 3742our @WAIT_FOR_TICK_BEGIN;
3028 3743
3029sub wait_for_tick { 3744sub wait_for_tick {
3030 return unless $TICK_WATCHER->is_active;
3031 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3032 3746
3033 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3034 push @WAIT_FOR_TICK, $signal; 3748 push @WAIT_FOR_TICK, $signal;
3035 $signal->wait; 3749 $signal->wait;
3036} 3750}
3037 3751
3038sub wait_for_tick_begin { 3752sub wait_for_tick_begin {
3039 return unless $TICK_WATCHER->is_active;
3040 return if $Coro::current == $Coro::main; 3753 return if tick_inhibit || $Coro::current == $Coro::main;
3041 3754
3042 my $signal = new Coro::Signal; 3755 my $signal = new Coro::Signal;
3043 push @WAIT_FOR_TICK_BEGIN, $signal; 3756 push @WAIT_FOR_TICK_BEGIN, $signal;
3044 $signal->wait; 3757 $signal->wait;
3045} 3758}
3046 3759
3047 my $min = 1e6;#d# 3760sub tick {
3048 my $avg = 10;
3049$TICK_WATCHER = Event->timer (
3050 reentrant => 0,
3051 parked => 1,
3052 prio => 0,
3053 at => $NEXT_TICK || $TICK,
3054 data => WF_AUTOCANCEL,
3055 cb => sub {
3056 if ($Coro::current != $Coro::main) { 3761 if ($Coro::current != $Coro::main) {
3057 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3762 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3058 unless ++$bug_warning > 10; 3763 unless ++$bug_warning > 10;
3059 return; 3764 return;
3060 } 3765 }
3061 3766
3062 $NOW = $tick_start = Event::time;
3063
3064 cf::server_tick; # one server iteration 3767 cf::server_tick; # one server iteration
3065 3768
3066 0 && sync_job {#d# 3769 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3067 for(1..10) { 3770 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3068 my $t = Event::time; 3771 Coro::async_pool {
3069 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3772 $Coro::current->{desc} = "runtime saver";
3070 or die; 3773 write_runtime_sync
3071 3774 or warn "ERROR: unable to write runtime file: $!";
3072 $map->width (50);
3073 $map->height (50);
3074 $map->alloc;
3075 $map->_load_objects ("/tmp/x.map", 1);
3076 my $t = Event::time - $t;
3077
3078 #next unless $t < 0.0013;#d#
3079 if ($t < $min) {
3080 $min = $t;
3081 }
3082 $avg = $avg * 0.99 + $t * 0.01;
3083 }
3084 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3085 exit 0;
3086 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3087 }; 3775 };
3776 }
3088 3777
3089 $RUNTIME += $TICK;
3090 $NEXT_TICK += $TICK;
3091
3092 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3093 $NEXT_RUNTIME_WRITE = $NOW + 10;
3094 Coro::async_pool {
3095 write_runtime
3096 or warn "ERROR: unable to write runtime file: $!";
3097 };
3098 }
3099
3100# my $AFTER = Event::time;
3101# warn $AFTER - $NOW;#d#
3102
3103 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3778 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3104 $sig->send; 3779 $sig->send;
3105 } 3780 }
3106 while (my $sig = shift @WAIT_FOR_TICK) { 3781 while (my $sig = shift @WAIT_FOR_TICK) {
3107 $sig->send; 3782 $sig->send;
3108 } 3783 }
3109 3784
3110 $NOW = Event::time; 3785 $LOAD = ($NOW - $TICK_START) / $TICK;
3111
3112 # if we are delayed by four ticks or more, skip them all
3113 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3114
3115 $TICK_WATCHER->at ($NEXT_TICK);
3116 $TICK_WATCHER->start;
3117
3118 $LOAD = ($NOW - $tick_start) / $TICK;
3119 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3786 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3120 3787
3121 _post_tick; 3788 if (0) {
3122 3789 if ($NEXT_TICK) {
3123 3790 my $jitter = $TICK_START - $NEXT_TICK;
3791 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3792 warn "jitter $JITTER\n";#d#
3793 }
3124 }, 3794 }
3125); 3795}
3126 3796
3127{ 3797{
3128 BDB::max_poll_time $TICK * 0.1; 3798 # configure BDB
3129 $BDB_POLL_WATCHER = Event->io ( 3799
3130 reentrant => 0,
3131 fd => BDB::poll_fileno,
3132 poll => 'r',
3133 prio => 0,
3134 data => WF_AUTOCANCEL,
3135 cb => \&BDB::poll_cb,
3136 );
3137 BDB::min_parallel 8; 3800 BDB::min_parallel 8;
3138 3801 BDB::max_poll_reqs $TICK * 0.1;
3139 BDB::set_sync_prepare { 3802 $AnyEvent::BDB::WATCHER->priority (1);
3140 my $status;
3141 my $current = $Coro::current;
3142 (
3143 sub {
3144 $status = $!;
3145 $current->ready; undef $current;
3146 },
3147 sub {
3148 Coro::schedule while defined $current;
3149 $! = $status;
3150 },
3151 )
3152 };
3153 3803
3154 unless ($DB_ENV) { 3804 unless ($DB_ENV) {
3155 $DB_ENV = BDB::db_env_create; 3805 $DB_ENV = BDB::db_env_create;
3806 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3807 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3808 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3809 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3810 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3156 3811
3157 cf::sync_job { 3812 cf::sync_job {
3158 eval { 3813 eval {
3159 BDB::db_env_open 3814 BDB::db_env_open
3160 $DB_ENV, 3815 $DB_ENV,
3162 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3817 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3163 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3818 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3164 0666; 3819 0666;
3165 3820
3166 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3821 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3167
3168 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3169 $DB_ENV->set_lk_detect;
3170 }; 3822 };
3171 3823
3172 cf::cleanup "db_env_open(db): $@" if $@; 3824 cf::cleanup "db_env_open(db): $@" if $@;
3173 }; 3825 };
3174 } 3826 }
3827
3828 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3829 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3830 };
3831 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3832 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3833 };
3834 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3835 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3836 };
3175} 3837}
3176 3838
3177{ 3839{
3840 # configure IO::AIO
3841
3178 IO::AIO::min_parallel 8; 3842 IO::AIO::min_parallel 8;
3179
3180 undef $Coro::AIO::WATCHER;
3181 IO::AIO::max_poll_time $TICK * 0.1; 3843 IO::AIO::max_poll_time $TICK * 0.1;
3182 $AIO_POLL_WATCHER = Event->io ( 3844 undef $AnyEvent::AIO::WATCHER;
3183 reentrant => 0,
3184 data => WF_AUTOCANCEL,
3185 fd => IO::AIO::poll_fileno,
3186 poll => 'r',
3187 prio => 6,
3188 cb => \&IO::AIO::poll_cb,
3189 );
3190} 3845}
3191 3846
3192my $_log_backtrace; 3847my $_log_backtrace;
3193 3848
3194sub _log_backtrace { 3849sub _log_backtrace {
3197 $msg =~ s/\n//; 3852 $msg =~ s/\n//;
3198 3853
3199 # limit the # of concurrent backtraces 3854 # limit the # of concurrent backtraces
3200 if ($_log_backtrace < 2) { 3855 if ($_log_backtrace < 2) {
3201 ++$_log_backtrace; 3856 ++$_log_backtrace;
3857 my $perl_bt = Carp::longmess $msg;
3202 async { 3858 async {
3859 $Coro::current->{desc} = "abt $msg";
3860
3203 my @bt = fork_call { 3861 my @bt = fork_call {
3204 @addr = map { sprintf "%x", $_ } @addr; 3862 @addr = map { sprintf "%x", $_ } @addr;
3205 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3863 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3206 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3864 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3207 or die "addr2line: $!"; 3865 or die "addr2line: $!";
3215 } 3873 }
3216 3874
3217 @funcs 3875 @funcs
3218 }; 3876 };
3219 3877
3220 LOG llevInfo, "[ABT] $msg\n"; 3878 LOG llevInfo, "[ABT] $perl_bt\n";
3879 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3221 LOG llevInfo, "[ABT] $_\n" for @bt; 3880 LOG llevInfo, "[ABT] $_\n" for @bt;
3222 --$_log_backtrace; 3881 --$_log_backtrace;
3223 }; 3882 };
3224 } else { 3883 } else {
3225 LOG llevInfo, "[ABT] $msg\n"; 3884 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines