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.314 by root, Mon Jul 23 16:53:15 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
25use JSON::XS 1.4 (); 51use JSON::XS 2.01 ();
26use BDB (); 52use BDB ();
27use Data::Dumper; 53use Data::Dumper;
28use Digest::MD5; 54use Digest::MD5;
29use Fcntl; 55use Fcntl;
30use YAML::Syck (); 56use YAML ();
31use IO::AIO 2.32 (); 57use IO::AIO ();
32use Time::HiRes; 58use Time::HiRes;
33use Compress::LZF; 59use Compress::LZF;
34use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
35 63
36# configure various modules to our taste 64# configure various modules to our taste
37# 65#
38$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
39Coro::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
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 68
47$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}
48 87
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 89
51our %COMMAND = (); 90our %COMMAND = ();
52our %COMMAND_TIME = (); 91our %COMMAND_TIME = ();
58our %EXT_MAP = (); # pluggable maps 97our %EXT_MAP = (); # pluggable maps
59 98
60our $RELOAD; # number of reloads so far 99our $RELOAD; # number of reloads so far
61our @EVENT; 100our @EVENT;
62 101
63our $CONFDIR = confdir; 102our $CONFDIR = confdir;
64our $DATADIR = datadir; 103our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 107our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 108our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 109our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 110our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 111our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 112our $BDBDIR = "$LOCALDIR/db";
113our $PIDFILE = "$LOCALDIR/pid";
114our $RUNTIMEFILE = "$LOCALDIR/runtime";
115
116our %RESOURCE;
74 117
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 118our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 120our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 121our $USE_FSYNC = 1; # use fsync to write maps - default off
82 122
123our $BDB_DEADLOCK_WATCHER;
124our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 125our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 126our $DB_ENV;
85 127
86our %CFG; 128our %CFG;
87 129
88our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 131our $RUNTIME;
132our $NOW;
90 133
91our %PLAYER; # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 135our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
94 137
95# 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 ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 140
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
101 145
102binmode STDOUT; 146binmode STDOUT;
103binmode STDERR; 147binmode STDERR;
104 148
105# read virtual server time, if available 149# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 150unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 151 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 152 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 153 $RUNTIME = <$fh> + 0.;
110} 154}
111 155
112mkdir $_ 156mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
158 202
159The raw value load value from the last tick. 203The raw value load value from the last tick.
160 204
161=item %cf::CFG 205=item %cf::CFG
162 206
163Configuration for the server, loaded from C</etc/crossfire/config>, or 207Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 208from wherever your confdir points to.
165 209
166=item cf::wait_for_tick, cf::wait_for_tick_begin 210=item cf::wait_for_tick, cf::wait_for_tick_begin
167 211
168These 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
186 $msg .= "\n" 230 $msg .= "\n"
187 unless $msg =~ /\n$/; 231 unless $msg =~ /\n$/;
188 232
189 $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;
190 234
191 utf8::encode $msg;
192 LOG llevError, $msg; 235 LOG llevError, $msg;
193 }; 236 };
194} 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#?
195 253
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 254@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 255@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 256@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 257@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206for my $pkg (qw( 264for my $pkg (qw(
207 cf::global cf::attachable 265 cf::global cf::attachable
208 cf::object cf::object::player 266 cf::object cf::object::player
209 cf::client cf::player 267 cf::client cf::player
210 cf::arch cf::living 268 cf::arch cf::living
269 cf::map cf::mapspace
211 cf::map cf::party cf::region 270 cf::party cf::region
212)) { 271)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 272 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 273}
216 274
217$Event::DIED = sub { 275$EV::DIED = sub {
218 warn "error in event callback: @_"; 276 warn "error in event callback: @_";
219}; 277};
220 278
221############################################################################# 279#############################################################################
222 280
245 $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;
246 $d 304 $d
247 } || "[unable to dump $_[0]: '$@']"; 305 } || "[unable to dump $_[0]: '$@']";
248} 306}
249 307
250=item $ref = cf::from_json $json 308=item $ref = cf::decode_json $json
251 309
252Converts a JSON string into the corresponding perl data structure. 310Converts a JSON string into the corresponding perl data structure.
253 311
254=item $json = cf::to_json $ref 312=item $json = cf::encode_json $ref
255 313
256Converts a perl data structure into its JSON representation. 314Converts a perl data structure into its JSON representation.
257 315
258=cut 316=cut
259 317
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 318our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 319
262sub to_json ($) { $json_coder->encode ($_[0]) } 320sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 321sub decode_json($) { $json_coder->decode ($_[0]) }
264 322
265=item cf::lock_wait $string 323=item cf::lock_wait $string
266 324
267Wait until the given lock is available. See cf::lock_acquire. 325Wait until the given lock is available. See cf::lock_acquire.
268 326
271Wait 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
272a 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,
273for example when the coroutine gets canceled), the lock is automatically 331for example when the coroutine gets canceled), the lock is automatically
274returned. 332returned.
275 333
334Locks are *not* recursive, locking from the same coro twice results in a
335deadlocked coro.
336
276Lock 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
277uses map_find and cf::map::load uses map_load). 338uses map_find and cf::map::load uses map_load).
278 339
279=item $locked = cf::lock_active $string 340=item $locked = cf::lock_active $string
280 341
281Return 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.
282 343
283=cut 344=cut
284 345
285our %LOCK; 346our %LOCK;
347our %LOCKER;#d#
286 348
287sub lock_wait($) { 349sub lock_wait($) {
288 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#
289 356
290 # wait for lock, if any 357 # wait for lock, if any
291 while ($LOCK{$key}) { 358 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 359 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 360 Coro::schedule;
299 366
300 # wait, to be sure we are not locked 367 # wait, to be sure we are not locked
301 lock_wait $key; 368 lock_wait $key;
302 369
303 $LOCK{$key} = []; 370 $LOCK{$key} = [];
371 $LOCKER{$key} = $Coro::current;#d#
304 372
305 Coro::guard { 373 Coro::guard {
374 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 375 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 376 $_->ready for @{ delete $LOCK{$key} };
308 } 377 }
309} 378}
310 379
313 382
314 ! ! $LOCK{$key} 383 ! ! $LOCK{$key}
315} 384}
316 385
317sub freeze_mainloop { 386sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 387 tick_inhibit_inc;
319 388
320 my $guard = Coro::guard { 389 Coro::guard \&tick_inhibit_dec;
321 $TICK_WATCHER->start;
322 };
323 $TICK_WATCHER->stop;
324 $guard
325} 390}
326 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
327=item cf::get_slot $time[, $priority] 407=item cf::get_slot $time[, $priority[, $name]]
328 408
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 409Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 410This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 411of cpu time till the next tick. The slot is only valid till the next cede.
332 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
333Useful for short background jobs. 416Useful for short background jobs.
334 417
335=cut 418=cut
336 419
337our @SLOT_QUEUE; 420our @SLOT_QUEUE;
338our $SLOT_QUEUE; 421our $SLOT_QUEUE;
339 422
340$SLOT_QUEUE->cancel if $SLOT_QUEUE; 423$SLOT_QUEUE->cancel if $SLOT_QUEUE;
341$SLOT_QUEUE = Coro::async { 424$SLOT_QUEUE = Coro::async {
425 $Coro::current->desc ("timeslot manager");
426
342 my $signal = new Coro::Signal; 427 my $signal = new Coro::Signal;
343 428
344 while () { 429 while () {
345 next_job: 430 next_job:
346 my $avail = cf::till_tick; 431 my $avail = cf::till_tick;
354 } 439 }
355 } 440 }
356 } 441 }
357 442
358 if (@SLOT_QUEUE) { 443 if (@SLOT_QUEUE) {
359 # we do not use wait_For_tick() as it returns immediately when tick is inactive 444 # we do not use wait_for_tick() as it returns immediately when tick is inactive
360 push @cf::WAIT_FOR_TICK, $signal; 445 push @cf::WAIT_FOR_TICK, $signal;
361 $signal->wait; 446 $signal->wait;
362 } else { 447 } else {
363 Coro::schedule; 448 Coro::schedule;
364 } 449 }
365 } 450 }
366}; 451};
367 452
368sub get_slot($;$) { 453sub get_slot($;$$) {
454 return if tick_inhibit || $Coro::current == $Coro::main;
455
369 my ($time, $pri) = @_; 456 my ($time, $pri, $name) = @_;
370 457
458 $time = $TICK * .6 if $time > $TICK * .6;
459 my $sig = new Coro::Signal;
460
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 461 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 462 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 463 $SLOT_QUEUE->ready;
374 $sig->wait; 464 $sig->wait;
375} 465}
376 466
384 474
385BEGIN { *async = \&Coro::async_pool } 475BEGIN { *async = \&Coro::async_pool }
386 476
387=item cf::sync_job { BLOCK } 477=item cf::sync_job { BLOCK }
388 478
389The design of Crossfire TRT requires that the main coroutine ($Coro::main) 479The design of Deliantra requires that the main coroutine ($Coro::main)
390is always able to handle events or runnable, as Crossfire TRT is only 480is always able to handle events or runnable, as Deliantra is only
391partly 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
392acceptable. 482acceptable.
393 483
394If 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
395the given BLOCK in another coroutine while waiting for the result. The 485the given BLOCK in another coroutine while waiting for the result. The
400 490
401sub sync_job(&) { 491sub sync_job(&) {
402 my ($job) = @_; 492 my ($job) = @_;
403 493
404 if ($Coro::current == $Coro::main) { 494 if ($Coro::current == $Coro::main) {
405 my $time = Event::time; 495 my $time = EV::time;
406 496
407 # this is the main coro, too bad, we have to block 497 # this is the main coro, too bad, we have to block
408 # till the operation succeeds, freezing the server :/ 498 # till the operation succeeds, freezing the server :/
409 499
410 # TODO: use suspend/resume instead 500 LOG llevError, Carp::longmess "sync job";#d#
411 # (but this is cancel-safe) 501
412 my $freeze_guard = freeze_mainloop; 502 my $freeze_guard = freeze_mainloop;
413 503
414 my $busy = 1; 504 my $busy = 1;
415 my @res; 505 my @res;
416 506
417 (async { 507 (async {
508 $Coro::current->desc ("sync job coro");
418 @res = eval { $job->() }; 509 @res = eval { $job->() };
419 warn $@ if $@; 510 warn $@ if $@;
420 undef $busy; 511 undef $busy;
421 })->prio (Coro::PRIO_MAX); 512 })->prio (Coro::PRIO_MAX);
422 513
423 while ($busy) { 514 while ($busy) {
424 Coro::cede or Event::one_event; 515 if (Coro::nready) {
516 Coro::cede_notself;
517 } else {
518 EV::loop EV::LOOP_ONESHOT;
425 } 519 }
520 }
426 521
427 $time = Event::time - $time; 522 my $time = EV::time - $time;
428 523
429 LOG llevError | logBacktrace, Carp::longmess "long sync job"
430 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
431
432 $tick_start += $time; # do not account sync jobs to server load 524 $TICK_START += $time; # do not account sync jobs to server load
433 525
434 wantarray ? @res : $res[0] 526 wantarray ? @res : $res[0]
435 } else { 527 } else {
436 # we are in another coroutine, how wonderful, everything just works 528 # we are in another coroutine, how wonderful, everything just works
437 529
462=item fork_call { }, $args 554=item fork_call { }, $args
463 555
464Executes the given code block with the given arguments in a seperate 556Executes the given code block with the given arguments in a seperate
465process, returning the results. Everything must be serialisable with 557process, returning the results. Everything must be serialisable with
466Coro::Storable. May, of course, block. Note that the executed sub may 558Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 559never block itself or use any form of event handling.
468 560
469=cut 561=cut
470
471sub _store_scalar {
472 open my $fh, ">", \my $buf
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478}
479 562
480sub fork_call(&@) { 563sub fork_call(&@) {
481 my ($cb, @args) = @_; 564 my ($cb, @args) = @_;
482 565
483# 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,
484# or die "socketpair: $!"; 567 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 568 # TODO: investigate and fix (likely this will be rather laborious)
486 or die "pipe: $!";
487 569
488 if (my $pid = fork) { 570 my @res = Coro::Util::fork_eval {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals; 571 reset_signals;
502 local $SIG{__WARN__}; 572 &$cb
503 local $SIG{__DIE__}; 573 }, @args;
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509 574
510 eval { 575 wantarray ? @res : $res[-1]
511 close $fh1; 576}
512 577
513 my @res = eval { $cb->(@args) }; 578=item $coin = coin_from_name $name
514 579
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 580=cut
516 close $fh2;
517 };
518 581
519 warn $@ if $@; 582our %coin_alias = (
520 _exit 0; 583 "silver" => "silvercoin",
521 } 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
522} 603}
523 604
524=item $value = cf::db_get $family => $key 605=item $value = cf::db_get $family => $key
525 606
526Returns a single value from the environment database. 607Returns a single value from the environment database.
528=item cf::db_put $family => $key => $value 609=item cf::db_put $family => $key => $value
529 610
530Stores 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
531data 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).
532 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
533=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}
534 637
535our $DB; 638our $DB;
536 639
537sub db_init { 640sub db_init {
538 unless ($DB) {
539 $DB = BDB::db_create $DB_ENV;
540
541 cf::sync_job { 641 cf::sync_job {
542 eval { 642 $DB ||= db_table "db";
543 $DB->set_flags (BDB::CHKSUM);
544
545 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
546 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
547 cf::cleanup "db_open(db): $!" if $!;
548 };
549 cf::cleanup "db_open(db): $@" if $@;
550 };
551 } 643 };
552} 644}
553 645
554sub db_get($$) { 646sub db_get($$) {
555 my $key = "$_[0]/$_[1]"; 647 my $key = "$_[0]/$_[1]";
556 648
606 if (1) { 698 if (1) {
607 $md5 = 699 $md5 =
608 join "\x00", 700 join "\x00",
609 $processversion, 701 $processversion,
610 map { 702 map {
611 Coro::cede; 703 cf::cede_to_tick;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 704 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src; 705 } 0.. $#$src;
614 706
615 707
616 my $dbmd5 = db_get cache => "$id/md5"; 708 my $dbmd5 = db_get cache => "$id/md5";
654 746
655############################################################################# 747#############################################################################
656 748
657=head2 ATTACHABLE OBJECTS 749=head2 ATTACHABLE OBJECTS
658 750
659Many 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
660attach callbacks/event handlers (a collection of which is called an "attachment") 752attach callbacks/event handlers (a collection of which is called an "attachment")
661to it. All such attachable objects support the following methods. 753to it. All such attachable objects support the following methods.
662 754
663In 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>
664C<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
665Crossfire TRT). 757Deliantra).
666 758
667=over 4 759=over 4
668 760
669=item $attachable->attach ($attachment, key => $value...) 761=item $attachable->attach ($attachment, key => $value...)
670 762
714=item cf::CLASS::attachment $name, ... 806=item cf::CLASS::attachment $name, ...
715 807
716Register an attachment by C<$name> through which attachable objects of the 808Register an attachment by C<$name> through which attachable objects of the
717given CLASS can refer to this attachment. 809given CLASS can refer to this attachment.
718 810
719Some classes such as crossfire maps and objects can specify attachments 811Some classes such as deliantra maps and objects can specify attachments
720that 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.
721 813
722These calls expect any number of the following handler/hook descriptions: 814These calls expect any number of the following handler/hook descriptions:
723 815
724=over 4 816=over 4
952 } 1044 }
953 1045
954 0 1046 0
955} 1047}
956 1048
957=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1049=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
958 1050
959=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1051=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
960 1052
961Generate an object-specific event with the given arguments. 1053Generate an object-specific event with the given arguments.
962 1054
968 1060
969=cut 1061=cut
970 1062
971############################################################################# 1063#############################################################################
972# object support 1064# object support
973#
974 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#
975sub _can_merge { 1099sub _can_merge {
976 my ($ob1, $ob2) = @_; 1100 my ($ob1, $ob2) = @_;
977 1101
978 local $Storable::canonical = 1; 1102 ++$SLOW_MERGES;#d#
979 my $fob1 = Storable::freeze $ob1;
980 my $fob2 = Storable::freeze $ob2;
981 1103
982 $fob1 eq $fob2 1104 # we do the slow way here
1105 return _object_equal $ob1, $ob2
983} 1106}
984 1107
985sub reattach { 1108sub reattach {
986 # basically do the same as instantiate, without calling instantiate 1109 # basically do the same as instantiate, without calling instantiate
987 my ($obj) = @_; 1110 my ($obj) = @_;
988 1111
1112 # no longer needed after getting rid of delete_package?
989 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
990 1114
991 my $registry = $obj->registry; 1115 my $registry = $obj->registry;
992 1116
993 @$registry = (); 1117 @$registry = ();
994 1118
1009cf::attachable->attach ( 1133cf::attachable->attach (
1010 prio => -1000000, 1134 prio => -1000000,
1011 on_instantiate => sub { 1135 on_instantiate => sub {
1012 my ($obj, $data) = @_; 1136 my ($obj, $data) = @_;
1013 1137
1014 $data = from_json $data; 1138 $data = decode_json $data;
1015 1139
1016 for (@$data) { 1140 for (@$data) {
1017 my ($name, $args) = @$_; 1141 my ($name, $args) = @$_;
1018 1142
1019 $obj->attach ($name, %{$args || {} }); 1143 $obj->attach ($name, %{$args || {} });
1035sub object_freezer_save { 1159sub object_freezer_save {
1036 my ($filename, $rdata, $objs) = @_; 1160 my ($filename, $rdata, $objs) = @_;
1037 1161
1038 sync_job { 1162 sync_job {
1039 if (length $$rdata) { 1163 if (length $$rdata) {
1164 utf8::decode (my $decname = $filename);
1040 warn sprintf "saving %s (%d,%d)\n", 1165 warn sprintf "saving %s (%d,%d)\n",
1041 $filename, length $$rdata, scalar @$objs; 1166 $decname, length $$rdata, scalar @$objs;
1042 1167
1043 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1044 chmod SAVE_MODE, $fh; 1169 aio_chmod $fh, SAVE_MODE;
1045 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1046 aio_fsync $fh if $cf::USE_FSYNC; 1171 aio_fsync $fh if $cf::USE_FSYNC;
1047 close $fh; 1172 aio_close $fh;
1048 1173
1049 if (@$objs) { 1174 if (@$objs) {
1050 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) {
1051 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
1052 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1053 aio_write $fh, 0, (length $data), $data, 0; 1178 aio_write $fh, 0, (length $data), $data, 0;
1054 aio_fsync $fh if $cf::USE_FSYNC; 1179 aio_fsync $fh if $cf::USE_FSYNC;
1055 close $fh; 1180 aio_close $fh;
1056 aio_rename "$filename.pst~", "$filename.pst"; 1181 aio_rename "$filename.pst~", "$filename.pst";
1057 } 1182 }
1058 } else { 1183 } else {
1059 aio_unlink "$filename.pst"; 1184 aio_unlink "$filename.pst";
1060 } 1185 }
1065 } 1190 }
1066 } else { 1191 } else {
1067 aio_unlink $filename; 1192 aio_unlink $filename;
1068 aio_unlink "$filename.pst"; 1193 aio_unlink "$filename.pst";
1069 } 1194 }
1070 } 1195 };
1071} 1196}
1072 1197
1073sub object_freezer_as_string { 1198sub object_freezer_as_string {
1074 my ($rdata, $objs) = @_; 1199 my ($rdata, $objs) = @_;
1075 1200
1087 or return; 1212 or return;
1088 1213
1089 unless (aio_stat "$filename.pst") { 1214 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1215 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1216 or return;
1217
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1218 my $st = eval { Coro::Storable::thaw $av };
1219 $av = $st->{objs};
1093 } 1220 }
1094 1221
1222 utf8::decode (my $decname = $filename);
1095 warn sprintf "loading %s (%d)\n", 1223 warn sprintf "loading %s (%d,%d)\n",
1096 $filename, length $data, scalar @{$av || []}; 1224 $decname, length $data, scalar @{$av || []};
1225
1097 return ($data, $av); 1226 ($data, $av)
1098} 1227}
1099 1228
1100=head2 COMMAND CALLBACKS 1229=head2 COMMAND CALLBACKS
1101 1230
1102=over 4 1231=over 4
1175 my ($pl, $buf) = @_; 1304 my ($pl, $buf) = @_;
1176 1305
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1306 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1307
1179 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
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1316 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1317 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1318 }
1319
1320 $pl->ext_reply ($reply, @reply)
1321 if $reply;
1322
1185 } else { 1323 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1325 }
1188 1326
1189 cf::override; 1327 cf::override;
1216 1354
1217 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1355 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1218 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1356 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1219 1357
1220 $ext{source} = 1358 $ext{source} =
1221 "package $pkg; use strict; use utf8;\n" 1359 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1222 . "#line 1 \"$path\"\n{\n" 1360 . "#line 1 \"$path\"\n{\n"
1223 . $source 1361 . $source
1224 . "\n};\n1"; 1362 . "\n};\n1";
1225 1363
1226 $todo{$base} = \%ext; 1364 $todo{$base} = \%ext;
1242 my $msg = $@ ? "$v->{path}: $@\n" 1380 my $msg = $@ ? "$v->{path}: $@\n"
1243 : "$v->{base}: extension inactive.\n"; 1381 : "$v->{base}: extension inactive.\n";
1244 1382
1245 if (exists $v->{meta}{mandatory}) { 1383 if (exists $v->{meta}{mandatory}) {
1246 warn $msg; 1384 warn $msg;
1247 warn "mandatory extension failed to load, exiting.\n"; 1385 cf::cleanup "mandatory extension failed to load, exiting.";
1248 exit 1;
1249 } 1386 }
1250 1387
1251 warn $msg; 1388 warn $msg;
1252 } 1389 }
1253 1390
1267 1404
1268=back 1405=back
1269 1406
1270=head2 CORE EXTENSIONS 1407=head2 CORE EXTENSIONS
1271 1408
1272Functions and methods that extend core crossfire objects. 1409Functions and methods that extend core deliantra objects.
1273 1410
1274=cut 1411=cut
1275 1412
1276package cf::player; 1413package cf::player;
1277 1414
1278use Coro::AIO; 1415use Coro::AIO;
1279 1416
1280=head3 cf::player 1417=head3 cf::player
1281 1418
1282=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}
1283 1434
1284=item cf::player::find $login 1435=item cf::player::find $login
1285 1436
1286Returns the given player object, loading it if necessary (might block). 1437Returns the given player object, loading it if necessary (might block).
1287 1438
1323 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1474 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1475 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1476 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326 aio_unlink +(playerdir $login) . "/$login.pl"; 1477 aio_unlink +(playerdir $login) . "/$login.pl";
1327 1478
1328 my $pl = load_pl path $login 1479 my $f = new_from_file cf::object::thawer path $login
1329 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;
1330 $cf::PLAYER{$login} = $pl 1487 $cf::PLAYER{$login} = $pl
1331 } 1488 }
1332 } 1489 }
1333} 1490}
1334 1491
1343 return if $pl->{deny_save}; 1500 return if $pl->{deny_save};
1344 1501
1345 aio_mkdir playerdir $pl, 0770; 1502 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1503 $pl->{last_save} = $cf::RUNTIME;
1347 1504
1505 cf::get_slot 0.01;
1506
1348 $pl->save_pl ($path); 1507 $pl->save_pl ($path);
1349 Coro::cede; 1508 cf::cede_to_tick;
1350} 1509}
1351 1510
1352sub new($) { 1511sub new($) {
1353 my ($login) = @_; 1512 my ($login) = @_;
1354 1513
1360 $cf::PLAYER{$login} = $self; 1519 $cf::PLAYER{$login} = $self;
1361 1520
1362 $self 1521 $self
1363} 1522}
1364 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
1365=item $pl->quit_character 1534=item $pl->quit_character
1366 1535
1367Nukes the player without looking back. If logged in, the connection will 1536Nukes the player without looking back. If logged in, the connection will
1368be destroyed. May block for a long time. 1537be destroyed. May block for a long time.
1369 1538
1373 my ($pl) = @_; 1542 my ($pl) = @_;
1374 1543
1375 my $name = $pl->ob->name; 1544 my $name = $pl->ob->name;
1376 1545
1377 $pl->{deny_save} = 1; 1546 $pl->{deny_save} = 1;
1378 $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
1379 1548
1380 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1549 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1381 $pl->deactivate; 1550 $pl->deactivate;
1551 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1552 $pl->ob->check_score;
1382 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1553 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1383 $pl->ns->destroy if $pl->ns; 1554 $pl->ns->destroy if $pl->ns;
1384 1555
1385 my $path = playerdir $pl; 1556 my $path = playerdir $pl;
1386 my $temp = "$path~$cf::RUNTIME~deleting~"; 1557 my $temp = "$path~$cf::RUNTIME~deleting~";
1422 or return []; 1593 or return [];
1423 1594
1424 my @logins; 1595 my @logins;
1425 1596
1426 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") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1603 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1604 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1605 $buf !~ /^password -------------$/m or next; # official not-valid tag
1606 }
1430 1607
1431 utf8::decode $login; 1608 utf8::decode $login;
1432 push @logins, $login; 1609 push @logins, $login;
1433 } 1610 }
1434 1611
1461 } 1638 }
1462 1639
1463 \@paths 1640 \@paths
1464} 1641}
1465 1642
1466=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1643=item $protocol_xml = $player->expand_cfpod ($cfpod)
1467 1644
1468Expand crossfire pod fragments into protocol xml. 1645Expand deliantra pod fragments into protocol xml.
1469 1646
1470=cut
1471
1472sub expand_cfpod {
1473 ((my $self), (local $_)) = @_;
1474
1475 # escape & and <
1476 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g;
1478
1479 # this is buggy, it needs to properly take care of nested <'s
1480
1481 1 while
1482 # replace B<>, I<>, U<> etc.
1483 s/B<([^\>]*)>/<b>$1<\/b>/
1484 || s/I<([^\>]*)>/<i>$1<\/i>/
1485 || s/U<([^\>]*)>/<u>$1<\/u>/
1486 # replace G<male|female> tags
1487 || s{G<([^>|]*)\|([^>]*)>}{
1488 $self->gender ? $2 : $1
1489 }ge
1490 # replace H<hint text>
1491 || s{H<([^\>]*)>}
1492 {
1493 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1494 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1495 "")
1496 [$self->{hintmode}]
1497 }ge;
1498
1499 # create single paragraphs (very hackish)
1500 s/(?<=\S)\n(?=\w)/ /g;
1501
1502 # compress some whitespace
1503 s/\s+\n/\n/g; # ws line-ends
1504 s/\n\n+/\n/g; # double lines
1505 s/^\n+//; # beginning lines
1506 s/\n+$//; # ending lines
1507
1508 $_
1509}
1510
1511sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode}
1514}
1515
1516=item $player->ext_reply ($msgid, %msg) 1647=item $player->ext_reply ($msgid, @msg)
1517 1648
1518Sends an ext reply to the player. 1649Sends an ext reply to the player.
1519 1650
1520=cut 1651=cut
1521 1652
1522sub ext_reply($$%) { 1653sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1654 my ($self, $id, @msg) = @_;
1524 1655
1525 $msg{msgid} = $id; 1656 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1657}
1528 1658
1529=item $player->ext_event ($type, %msg) 1659=item $player->ext_msg ($type, @msg)
1530 1660
1531Sends an ext event to the client. 1661Sends an ext event to the client.
1532 1662
1533=cut 1663=cut
1534 1664
1535sub ext_event($$%) { 1665sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1666 my ($self, $type, @msg) = @_;
1537 1667
1538 $self->ns->ext_event ($type, %msg); 1668 $self->ns->ext_msg ($type, @msg);
1539} 1669}
1540 1670
1541=head3 cf::region 1671=head3 cf::region
1542 1672
1543=over 4 1673=over 4
1587our $MAX_RESET = 3600; 1717our $MAX_RESET = 3600;
1588our $DEFAULT_RESET = 3000; 1718our $DEFAULT_RESET = 3000;
1589 1719
1590sub generate_random_map { 1720sub generate_random_map {
1591 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
1592 # mit "rum" bekleckern, nicht 1725 # mit "rum" bekleckern, nicht
1593 $self->_create_random_map ( 1726 $self->_create_random_map (
1594 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1727 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1595 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1728 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1596 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1729 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1718 1851
1719# the temporary/swap location 1852# the temporary/swap location
1720sub save_path { 1853sub save_path {
1721 my ($self) = @_; 1854 my ($self) = @_;
1722 1855
1723 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1856 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1724 "$TMPDIR/$path.map" 1857 "$TMPDIR/$path.map"
1725} 1858}
1726 1859
1727# the unique path, undef == no special unique path 1860# the unique path, undef == no special unique path
1728sub uniq_path { 1861sub uniq_path {
1729 my ($self) = @_; 1862 my ($self) = @_;
1730 1863
1731 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1732 "$UNIQUEDIR/$path" 1865 "$UNIQUEDIR/$path"
1733} 1866}
1734 1867
1735# and all this just because we cannot iterate over 1868# and all this just because we cannot iterate over
1736# all maps in C++... 1869# all maps in C++...
1759 1892
1760sub load_header_from($) { 1893sub load_header_from($) {
1761 my ($self, $path) = @_; 1894 my ($self, $path) = @_;
1762 1895
1763 utf8::encode $path; 1896 utf8::encode $path;
1764 #aio_open $path, O_RDONLY, 0 1897 my $f = new_from_file cf::object::thawer $path
1765 # or return;
1766
1767 $self->_load_header ($path)
1768 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;
1769 1905
1770 $self->{load_path} = $path; 1906 $self->{load_path} = $path;
1771 1907
1772 1 1908 1
1773} 1909}
1827sub find { 1963sub find {
1828 my ($path, $origin) = @_; 1964 my ($path, $origin) = @_;
1829 1965
1830 $path = normalise $path, $origin && $origin->path; 1966 $path = normalise $path, $origin && $origin->path;
1831 1967
1968 cf::lock_wait "map_data:$path";#d#remove
1832 cf::lock_wait "map_find:$path"; 1969 cf::lock_wait "map_find:$path";
1833 1970
1834 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1835 my $guard = cf::lock_acquire "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
1974
1836 my $map = new_from_path cf::map $path 1975 my $map = new_from_path cf::map $path
1837 or return; 1976 or return;
1838 1977
1839 $map->{last_save} = $cf::RUNTIME; 1978 $map->{last_save} = $cf::RUNTIME;
1840 1979
1842 or return; 1981 or return;
1843 1982
1844 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1983 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845 # doing this can freeze the server in a sync job, obviously 1984 # doing this can freeze the server in a sync job, obviously
1846 #$cf::WAIT_FOR_TICK->wait; 1985 #$cf::WAIT_FOR_TICK->wait;
1986 undef $guard2;
1987 undef $guard1;
1847 $map->reset; 1988 $map->reset;
1848 undef $guard;
1849 return find $path; 1989 return find $path;
1850 } 1990 }
1851 1991
1852 $cf::MAP{$path} = $map 1992 $cf::MAP{$path} = $map
1853 } 1993 }
1862 local $self->{deny_reset} = 1; # loading can take a long time 2002 local $self->{deny_reset} = 1; # loading can take a long time
1863 2003
1864 my $path = $self->{path}; 2004 my $path = $self->{path};
1865 2005
1866 { 2006 {
1867 my $guard = cf::lock_acquire "map_load:$path"; 2007 my $guard = cf::lock_acquire "map_data:$path";
1868 2008
2009 return unless $self->valid;
1869 return if $self->in_memory != cf::MAP_SWAPPED; 2010 return unless $self->in_memory == cf::MAP_SWAPPED;
1870 2011
1871 $self->in_memory (cf::MAP_LOADING); 2012 $self->in_memory (cf::MAP_LOADING);
1872 2013
1873 $self->alloc; 2014 $self->alloc;
1874 2015
1875 $self->pre_load; 2016 $self->pre_load;
1876 Coro::cede; 2017 cf::cede_to_tick;
1877 2018
2019 my $f = new_from_file cf::object::thawer $self->{load_path};
2020 $f->skip_block;
1878 $self->_load_objects ($self->{load_path}, 1) 2021 $self->_load_objects ($f)
1879 or return; 2022 or return;
1880 2023
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2024 $self->post_load_original
1882 if delete $self->{load_original}; 2025 if delete $self->{load_original};
1883 2026
1884 if (my $uniq = $self->uniq_path) { 2027 if (my $uniq = $self->uniq_path) {
1885 utf8::encode $uniq; 2028 utf8::encode $uniq;
1886 if (aio_open $uniq, O_RDONLY, 0) { 2029 unless (aio_stat $uniq) {
2030 if (my $f = new_from_file cf::object::thawer $uniq) {
1887 $self->clear_unique_items; 2031 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 2032 $self->_load_objects ($f);
2033 $f->resolve_delayed_derefs;
2034 }
1889 } 2035 }
1890 } 2036 }
1891 2037
1892 Coro::cede; 2038 $f->resolve_delayed_derefs;
2039
2040 cf::cede_to_tick;
1893 # now do the right thing for maps 2041 # now do the right thing for maps
1894 $self->link_multipart_objects; 2042 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 2043 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 2044 unless $self->difficulty;
1897 Coro::cede; 2045 cf::cede_to_tick;
1898 2046
1899 unless ($self->{deny_activate}) { 2047 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 2048 $self->decay_objects;
1901 $self->fix_auto_apply; 2049 $self->fix_auto_apply;
1902 $self->update_buttons; 2050 $self->update_buttons;
1903 Coro::cede; 2051 cf::cede_to_tick;
1904 $self->set_darkness_map; 2052 $self->set_darkness_map;
1905 Coro::cede; 2053 cf::cede_to_tick;
1906 $self->activate; 2054 $self->activate;
1907 } 2055 }
1908 2056
2057 $self->{last_save} = $cf::RUNTIME;
2058 $self->last_access ($cf::RUNTIME);
2059
1909 $self->in_memory (cf::MAP_IN_MEMORY); 2060 $self->in_memory (cf::MAP_ACTIVE);
1910 } 2061 }
1911 2062
1912 $self->post_load; 2063 $self->post_load;
1913} 2064}
1914 2065
1923 2074
1924 $self 2075 $self
1925} 2076}
1926 2077
1927# 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
1928sub load_diag { 2079sub load_neighbours {
1929 my ($map) = @_; 2080 my ($map) = @_;
1930 2081
1931 my @diag; # diagonal neighbours 2082 my @neigh; # diagonal neighbours
1932 2083
1933 for (0 .. 3) { 2084 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 2085 my $neigh = $map->tile_path ($_)
1935 or next; 2086 or next;
1936 $neigh = find $neigh, $map 2087 $neigh = find $neigh, $map
1937 or next; 2088 or next;
1938 $neigh->load; 2089 $neigh->load;
1939 2090
2091 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2092 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2093 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 2094 }
1943 2095
1944 for (@diag) { 2096 for (grep defined $_->[0], @neigh) {
2097 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 2098 my $neigh = find $path, $origin
1946 or next; 2099 or next;
1947 $neigh->load; 2100 $neigh->load;
1948 } 2101 }
1949} 2102}
1950 2103
1955} 2108}
1956 2109
1957sub do_load_sync { 2110sub do_load_sync {
1958 my ($map) = @_; 2111 my ($map) = @_;
1959 2112
2113 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2114 if $Coro::current == $Coro::main;
2115
1960 cf::sync_job { $map->load }; 2116 cf::sync_job { $map->load };
1961} 2117}
1962 2118
1963our %MAP_PREFETCH; 2119our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 2120our $MAP_PREFETCHER = undef;
1965 2121
1966sub find_async { 2122sub find_async {
1967 my ($path, $origin) = @_; 2123 my ($path, $origin, $load) = @_;
1968 2124
1969 $path = normalise $path, $origin && $origin->{path}; 2125 $path = normalise $path, $origin && $origin->{path};
1970 2126
1971 if (my $map = $cf::MAP{$path}) { 2127 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2128 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1973 } 2129 }
1974 2130
1975 undef $MAP_PREFETCH{$path}; 2131 $MAP_PREFETCH{$path} |= $load;
2132
1976 $MAP_PREFETCHER ||= cf::async { 2133 $MAP_PREFETCHER ||= cf::async {
2134 $Coro::current->{desc} = "map prefetcher";
2135
1977 while (%MAP_PREFETCH) { 2136 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 2137 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 2138 if (my $map = find $k) {
1980 $map->load; 2139 $map->load if $v;
1981 } 2140 }
1982 2141
1983 delete $MAP_PREFETCH{$path}; 2142 delete $MAP_PREFETCH{$k};
1984 } 2143 }
1985 } 2144 }
1986 undef $MAP_PREFETCHER; 2145 undef $MAP_PREFETCHER;
1987 }; 2146 };
1988 $MAP_PREFETCHER->prio (6); 2147 $MAP_PREFETCHER->prio (6);
1991} 2150}
1992 2151
1993sub save { 2152sub save {
1994 my ($self) = @_; 2153 my ($self) = @_;
1995 2154
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 2155 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 2156
1998 $self->{last_save} = $cf::RUNTIME; 2157 $self->{last_save} = $cf::RUNTIME;
1999 2158
2000 return unless $self->dirty; 2159 return unless $self->dirty;
2001 2160
2007 return if $self->{deny_save}; 2166 return if $self->{deny_save};
2008 2167
2009 local $self->{last_access} = $self->last_access;#d# 2168 local $self->{last_access} = $self->last_access;#d#
2010 2169
2011 cf::async { 2170 cf::async {
2171 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2172 $_->contr->save for $self->players;
2013 }; 2173 };
2174
2175 cf::get_slot 0.02;
2014 2176
2015 if ($uniq) { 2177 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2178 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2017 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2179 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2018 } else { 2180 } else {
2024 my ($self) = @_; 2186 my ($self) = @_;
2025 2187
2026 # save first because save cedes 2188 # save first because save cedes
2027 $self->save; 2189 $self->save;
2028 2190
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2191 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2192
2031 return if $self->players; 2193 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2194 return if $self->in_memory != cf::MAP_ACTIVE;
2033 return if $self->{deny_save}; 2195 return if $self->{deny_save};
2034 2196
2197 $self->in_memory (cf::MAP_SWAPPED);
2198
2199 $self->deactivate;
2200 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2201 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2202}
2038 2203
2039sub reset_at { 2204sub reset_at {
2040 my ($self) = @_; 2205 my ($self) = @_;
2041 2206
2073 if $uniq; 2238 if $uniq;
2074 } 2239 }
2075 2240
2076 delete $cf::MAP{$self->path}; 2241 delete $cf::MAP{$self->path};
2077 2242
2243 $self->deactivate;
2244 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2245 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2246
2082 $self->unlink_save; 2247 $self->unlink_save;
2083 $self->destroy; 2248 $self->destroy;
2084} 2249}
2085 2250
2086my $nuke_counter = "aaaa"; 2251my $nuke_counter = "aaaa";
2087 2252
2088sub nuke { 2253sub nuke {
2089 my ($self) = @_; 2254 my ($self) = @_;
2090 2255
2256 {
2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2258
2091 delete $cf::MAP{$self->path}; 2259 delete $cf::MAP{$self->path};
2092 2260
2093 $self->unlink_save; 2261 $self->unlink_save;
2094 2262
2095 bless $self, "cf::map"; 2263 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2264 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2265 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2266 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2267 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2268
2101 $cf::MAP{$self->path} = $self; 2269 $cf::MAP{$self->path} = $self;
2270 }
2102 2271
2103 $self->reset; # polite request, might not happen 2272 $self->reset; # polite request, might not happen
2104} 2273}
2105 2274
2106=item $maps = cf::map::tmp_maps 2275=item $maps = cf::map::tmp_maps
2148 2317
2149sub unique_maps() { 2318sub unique_maps() {
2150 [ 2319 [
2151 map { 2320 map {
2152 utf8::decode $_; 2321 utf8::decode $_;
2153 /\.map$/ 2322 s/\.map$//; # TODO future compatibility hack
2323 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2324 ? ()
2154 ? normalise $_ 2325 : normalise $_
2155 : ()
2156 } @{ aio_readdir $UNIQUEDIR or [] } 2326 } @{ aio_readdir $UNIQUEDIR or [] }
2157 ] 2327 ]
2158} 2328}
2159 2329
2160package cf;
2161
2162=back 2330=back
2163 2331
2164=head3 cf::object 2332=head3 cf::object
2165 2333
2166=cut 2334=cut
2169 2337
2170=over 4 2338=over 4
2171 2339
2172=item $ob->inv_recursive 2340=item $ob->inv_recursive
2173 2341
2174Returns 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.
2175 2344
2176=cut 2345=cut
2177 2346
2178sub inv_recursive_; 2347sub inv_recursive_;
2179sub inv_recursive_ { 2348sub inv_recursive_ {
2182 2351
2183sub inv_recursive { 2352sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2353 inv_recursive_ inv $_[0]
2185} 2354}
2186 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
2187package cf; 2384package cf;
2188 2385
2189=back 2386=back
2190 2387
2191=head3 cf::object::player 2388=head3 cf::object::player
2197Sends 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>
2198can 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
2199dialogue with the given NPC character. 2396dialogue with the given NPC character.
2200 2397
2201=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};
2202 2413
2203# rough implementation of a future "reply" method that works 2414# rough implementation of a future "reply" method that works
2204# with dialog boxes. 2415# with dialog boxes.
2205#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
2206sub cf::object::player::reply($$$;$) { 2417sub cf::object::player::reply($$$;$) {
2213 2424
2214 } else { 2425 } else {
2215 my $pl = $self->contr; 2426 my $pl = $self->contr;
2216 2427
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2428 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2429 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2431
2226 } else { 2432 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2433 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2434 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2229 } 2435 }
2230 } 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 (@_);
2231} 2447}
2232 2448
2233=item $player_object->may ("access") 2449=item $player_object->may ("access")
2234 2450
2235Returns wether the given player is authorized to access resource "access" 2451Returns wether the given player is authorized to access resource "access"
2248 2464
2249=item $player_object->enter_link 2465=item $player_object->enter_link
2250 2466
2251Freezes 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}>).
2252 2468
2253The 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.
2254I<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.
2255 2473
2256Will never block. 2474Will never block.
2257 2475
2258=item $player_object->leave_link ($map, $x, $y) 2476=item $player_object->leave_link ($map, $x, $y)
2259 2477
2314 # use -1 or undef as default coordinates, not 0, 0 2532 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2533 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2534 if $x <=0 && $y <= 0;
2317 2535
2318 $map->load; 2536 $map->load;
2319 $map->load_diag; 2537 $map->load_neighbours;
2320 2538
2321 return unless $self->contr->active; 2539 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2322 $self->activate_recursive; 2541 $self->activate_recursive;
2323 2542
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2325 $self->enter_map ($map, $x, $y); 2544 $self->enter_map ($map, $x, $y);
2326} 2545}
2331her, loading and preparing them map, calling the provided $check callback 2550her, loading and preparing them map, calling the provided $check callback
2332that 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
2333the new (success) or old (failed) map position. In either case, $done will 2552the new (success) or old (failed) map position. In either case, $done will
2334be called at the end of this process. 2553be called at the end of this process.
2335 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 >>.
2557
2336=cut 2558=cut
2337 2559
2338our $GOTOGEN; 2560our $GOTOGEN;
2339 2561
2340sub cf::object::player::goto { 2562sub cf::object::player::goto {
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2566 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2567
2346 $self->enter_link; 2568 $self->enter_link;
2347 2569
2348 (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
2349 my $map = eval { 2592 my $map = eval {
2350 my $map = cf::map::find $path; 2593 my $map = defined $path ? cf::map::find $path : undef;
2351 2594
2352 if ($map) { 2595 if ($map) {
2353 $map = $map->customise_for ($self); 2596 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2597 $map = $check->($map) if $check && $map;
2355 } else { 2598 } else {
2356 $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);
2357 } 2600 }
2358 2601
2359 $map 2602 $map
2360 }; 2603 };
2361 2604
2397} 2640}
2398 2641
2399sub prepare_random_map { 2642sub prepare_random_map {
2400 my ($exit) = @_; 2643 my ($exit) = @_;
2401 2644
2402 my $guard = cf::lock_acquire "exit_prepare:$exit";
2403
2404 # all this does is basically replace the /! path by 2645 # all this does is basically replace the /! path by
2405 # a new random map path (?random/...) with a seed 2646 # a new random map path (?random/...) with a seed
2406 # that depends on the exit object 2647 # that depends on the exit object
2407 2648
2408 my $rmp = parse_random_map_params $exit->msg; 2649 my $rmp = parse_random_map_params $exit->msg;
2410 if ($exit->map) { 2651 if ($exit->map) {
2411 $rmp->{region} = $exit->region->name; 2652 $rmp->{region} = $exit->region->name;
2412 $rmp->{origin_map} = $exit->map->path; 2653 $rmp->{origin_map} = $exit->map->path;
2413 $rmp->{origin_x} = $exit->x; 2654 $rmp->{origin_x} = $exit->x;
2414 $rmp->{origin_y} = $exit->y; 2655 $rmp->{origin_y} = $exit->y;
2656
2657 $exit->map->touch;
2415 } 2658 }
2416 2659
2417 $rmp->{random_seed} ||= $exit->random_seed; 2660 $rmp->{random_seed} ||= $exit->random_seed;
2418 2661
2419 my $data = cf::to_json $rmp; 2662 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2420 my $md5 = Digest::MD5::md5_hex $data; 2663 my $md5 = Digest::MD5::md5_hex $data;
2421 my $meta = "$RANDOMDIR/$md5.meta"; 2664 my $meta = "$RANDOMDIR/$md5.meta";
2422 2665
2423 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2666 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2424 aio_write $fh, 0, (length $data), $data, 0; 2667 aio_write $fh, 0, (length $data), $data, 0;
2425 undef $fh; 2668 undef $fh;
2426 aio_rename "$meta~", $meta; 2669 aio_rename "$meta~", $meta;
2427 2670
2671 my $slaying = "?random/$md5";
2672
2673 if ($exit->valid) {
2428 $exit->slaying ("?random/$md5"); 2674 $exit->slaying ("?random/$md5");
2429 $exit->msg (undef); 2675 $exit->msg (undef);
2676 }
2430 } 2677 }
2431} 2678}
2432 2679
2433sub cf::object::player::enter_exit { 2680sub cf::object::player::enter_exit {
2434 my ($self, $exit) = @_; 2681 my ($self, $exit) = @_;
2435 2682
2436 return unless $self->type == cf::PLAYER; 2683 return unless $self->type == cf::PLAYER;
2437 2684
2438 if ($exit->slaying eq "/!") {
2439 #TODO: this should de-fi-ni-te-ly not be a sync-job
2440 # the problem is that $exit might not survive long enough
2441 # so it needs to be done right now, right here
2442 cf::sync_job { prepare_random_map $exit };
2443 }
2444
2445 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2446 my $hp = $exit->stats->hp;
2447 my $sp = $exit->stats->sp;
2448
2449 $self->enter_link; 2685 $self->enter_link;
2450 2686
2451 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED);
2454
2455 (async { 2687 (async {
2456 $self->deactivate_recursive; # just to be sure 2688 $Coro::current->{desc} = "enter_exit";
2689
2457 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
2458 $self->goto ($slaying, $hp, $sp); 2705 $self->goto ($map, $x, $y);
2459 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
2460 1; 2711 1
2461 }) { 2712 }) {
2462 $self->message ("Something went wrong deep within the crossfire server. " 2713 $self->message ("Something went wrong deep within the deliantra server. "
2463 . "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. "
2464 . "Please report this to the dungeon master!", 2715 . "Please report this to the dungeon master!",
2465 cf::NDI_UNIQUE | cf::NDI_RED); 2716 cf::NDI_UNIQUE | cf::NDI_RED);
2466 2717
2467 warn "ERROR in enter_exit: $@"; 2718 warn "ERROR in enter_exit: $@";
2495the 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
2496the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2497 2748
2498=cut 2749=cut
2499 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
2500sub cf::client::send_msg { 2809sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2810 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2811
2503 $msg = $self->pl->expand_cfpod ($msg); 2812 $msg = $self->pl->expand_cfpod ($msg)
2813 unless $color & cf::NDI_VERBATIM;
2504 2814
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 2815 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 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
2507 if (ref $channel) { 2826 } elsif (ref $channel) {
2508 # send meta info to client, if not yet sent 2827 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2828 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2829 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2830 $self->ext_msg (channel_info => $channel)
2831 if $self->can_msg;
2512 } 2832 }
2513 2833
2514 $channel = $channel->{id}; 2834 $channel = $channel->{id};
2515 } 2835 }
2516 2836
2517 return unless @extra || length $msg; 2837 return unless @extra || length $msg;
2518 2838
2519 if ($self->can_msg) { 2839 if ($self->can_msg) {
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $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);
2521 } else { 2860 } else {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 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
2533 if (0 && $msg =~ /\[/) { 2876 if (0 && $msg =~ /\[/) {
2877 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2878 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2879 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2880 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2881 $self->send_packet ("drawinfo $color $msg")
2538 } 2882 }
2539 } 2883 }
2540 } 2884 }
2541} 2885}
2542 2886
2543=item $client->ext_event ($type, %msg) 2887=item $client->ext_msg ($type, @msg)
2544 2888
2545Sends an ext event to the client. 2889Sends an ext event to the client.
2546 2890
2547=cut 2891=cut
2548 2892
2549sub cf::client::ext_event($$%) { 2893sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2894 my ($self, $type, @msg) = @_;
2551 2895
2552 return unless $self->extcmd; 2896 if ($self->extcmd == 2) {
2553 2897 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2898 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2899 push @msg, msgtype => "event_$type";
2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%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 }
2556} 2920}
2557 2921
2558=item $success = $client->query ($flags, "text", \&cb) 2922=item $success = $client->query ($flags, "text", \&cb)
2559 2923
2560Queues a query to the client, calling the given callback with 2924Queues a query to the client, calling the given callback with
2615 my ($ns, $buf) = @_; 2979 my ($ns, $buf) = @_;
2616 2980
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2981 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 2982
2619 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
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2991 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 2992 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 2993 }
2994
2995 $ns->ext_reply ($reply, @reply)
2996 if $reply;
2997
2626 } else { 2998 } else {
2627 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";
2628 } 3000 }
2629 3001
2630 cf::override; 3002 cf::override;
2677our $safe = new Safe "safe"; 3049our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 3050our $safe_hole = new Safe::Hole;
2679 3051
2680$SIG{FPE} = 'IGNORE'; 3052$SIG{FPE} = 'IGNORE';
2681 3053
2682$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));
2683 3059
2684# here we export the classes and methods available to script code 3060# here we export the classes and methods available to script code
2685 3061
2686=pod 3062=pod
2687 3063
2688The following functions and methods are available within a safe environment: 3064The following functions and methods are available within a safe environment:
2689 3065
2690 cf::object 3066 cf::object
2691 contr pay_amount pay_player map x y force_find force_add 3067 contr pay_amount pay_player map x y force_find force_add destroy
2692 insert remove 3068 insert remove name archname title slaying race decrease split
2693 3069
2694 cf::object::player 3070 cf::object::player
2695 player 3071 player
2696 3072
2697 cf::player 3073 cf::player
2702 3078
2703=cut 3079=cut
2704 3080
2705for ( 3081for (
2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2707 insert remove)], 3083 insert remove inv nrof name archname title slaying race
3084 decrease split destroy change_exp)],
2708 ["cf::object::player" => qw(player)], 3085 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 3086 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 3087 ["cf::map" => qw(trigger)],
2711) { 3088) {
2712 no strict 'refs'; 3089 no strict 'refs';
2788# the server's init and main functions 3165# the server's init and main functions
2789 3166
2790sub load_facedata($) { 3167sub load_facedata($) {
2791 my ($path) = @_; 3168 my ($path) = @_;
2792 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
2793 warn "loading facedata from $path\n"; 3176 warn "loading facedata from $path\n";
2794 3177
2795 my $facedata; 3178 my $facedata;
2796 0 < aio_load $path, $facedata 3179 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 3180 or die "$path: $!";
2799 $facedata = Coro::Storable::thaw $facedata; 3182 $facedata = Coro::Storable::thaw $facedata;
2800 3183
2801 $facedata->{version} == 2 3184 $facedata->{version} == 2
2802 or cf::cleanup "$path: version mismatch, cannot proceed."; 3185 or cf::cleanup "$path: version mismatch, cannot proceed.";
2803 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
2804 { 3194 {
2805 my $faces = $facedata->{faceinfo}; 3195 my $faces = $facedata->{faceinfo};
2806 3196
2807 while (my ($face, $info) = each %$faces) { 3197 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3198 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3199
2809 cf::face::set_visibility $idx, $info->{visibility}; 3200 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 3201 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3202 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3203 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 3204
2814 cf::cede_to_tick; 3205 cf::cede_to_tick;
2815 } 3206 }
2816 3207
2817 while (my ($face, $info) = each %$faces) { 3208 while (my ($face, $info) = each %$faces) {
2818 next unless $info->{smooth}; 3209 next unless $info->{smooth};
3210
2819 my $idx = cf::face::find $face 3211 my $idx = cf::face::find $face
2820 or next; 3212 or next;
3213
2821 if (my $smooth = cf::face::find $info->{smooth}) { 3214 if (my $smooth = cf::face::find $info->{smooth}) {
2822 cf::face::set_smooth $idx, $smooth; 3215 cf::face::set_smooth $idx, $smooth;
2823 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3216 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2824 } else { 3217 } else {
2825 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3218 warn "smooth face '$info->{smooth}' not found for face '$face'";
2842 3235
2843 { 3236 {
2844 # TODO: for gcfclient pleasure, we should give resources 3237 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 3238 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 3239 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical;
2848 3240
2849 while (my ($name, $info) = each %$res) { 3241 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({ 3242 if (defined $info->{type}) {
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3243 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3244 my $data;
2857 3245
2858 if ($name =~ /\.jpg$/) { 3246 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3247 # prepend meta info
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 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};
2861 } else { 3261 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 3262 $RESOURCE{$name} = $info;
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 3263 }
2868 3264
2869 cf::cede_to_tick; 3265 cf::cede_to_tick;
2870 } 3266 }
2871 } 3267 }
2872 3268
3269 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3270
2873 1 3271 1
2874} 3272}
2875 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
2876sub 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
2877 load_resource_file "$MAPDIR/regions" 3317 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 3318 or die "unable to load regions file\n";
2879 3319
2880 for (cf::region::list) { 3320 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3321 $_->{match} = qr/$_->{match}/
2889} 3329}
2890 3330
2891sub reload_archetypes { 3331sub reload_archetypes {
2892 load_resource_file "$DATADIR/archetypes" 3332 load_resource_file "$DATADIR/archetypes"
2893 or die "unable to load archetypes\n"; 3333 or die "unable to load archetypes\n";
2894 #d# NEED to laod twice to resolve forward references
2895 # this really needs to be done in an extra post-pass
2896 # (which needs to be synchronous, so solve it differently)
2897 load_resource_file "$DATADIR/archetypes"
2898 or die "unable to load archetypes\n";
2899} 3334}
2900 3335
2901sub reload_treasures { 3336sub reload_treasures {
2902 load_resource_file "$DATADIR/treasures" 3337 load_resource_file "$DATADIR/treasures"
2903 or die "unable to load treasurelists\n"; 3338 or die "unable to load treasurelists\n";
2904} 3339}
2905 3340
2906sub reload_resources { 3341sub reload_resources {
2907 warn "reloading resource files...\n"; 3342 warn "reloading resource files...\n";
2908 3343
3344 reload_facedata;
3345 reload_archetypes;
2909 reload_regions; 3346 reload_regions;
2910 reload_facedata;
2911 #reload_archetypes;#d#
2912 reload_archetypes;
2913 reload_treasures; 3347 reload_treasures;
2914 3348
2915 warn "finished reloading resource files\n"; 3349 warn "finished reloading resource files\n";
2916} 3350}
2917 3351
2918sub init { 3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
2919 reload_resources; 3357 reload_resources;
2920} 3358}
2921 3359
2922sub cfg_load { 3360sub reload_config {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3361 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3362 or return;
2925 3363
2926 local $/; 3364 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3365 *CFG = YAML::Load <$fh>;
2928 3366
2929 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3367 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2930 3368
2931 $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};
2932 $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};
2938 }; 3376 };
2939 warn $@ if $@; 3377 warn $@ if $@;
2940 } 3378 }
2941} 3379}
2942 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
2943sub main { 3400sub main {
3401 atomic;
3402
2944 # we must not ever block the main coroutine 3403 # we must not ever block the main coroutine
2945 local $Coro::idle = sub { 3404 local $Coro::idle = sub {
2946 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#
2947 (async { 3406 (async {
2948 Event::one_event; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT;
2949 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
2950 }; 3410 };
2951 3411
2952 cfg_load; 3412 {
3413 my $guard = freeze_mainloop;
3414 reload_config;
2953 db_init; 3415 db_init;
2954 load_extensions; 3416 load_extensions;
2955 3417
2956 $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
2957 Event::loop; 3426 EV::loop;
2958} 3427}
2959 3428
2960############################################################################# 3429#############################################################################
2961# initialisation and cleanup 3430# initialisation and cleanup
2962 3431
2963# install some emergency cleanup handlers 3432# install some emergency cleanup handlers
2964BEGIN { 3433BEGIN {
3434 our %SIGWATCHER = ();
2965 for my $signal (qw(INT HUP TERM)) { 3435 for my $signal (qw(INT HUP TERM)) {
2966 Event->signal ( 3436 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2967 reentrant => 0,
2968 data => WF_AUTOCANCEL,
2969 signal => $signal,
2970 prio => 0,
2971 cb => sub {
2972 cf::cleanup "SIG$signal"; 3437 cf::cleanup "SIG$signal";
2973 },
2974 ); 3438 };
2975 } 3439 }
2976} 3440}
2977 3441
2978sub write_runtime { 3442sub write_runtime_sync {
2979 my $runtime = "$LOCALDIR/runtime";
2980
2981 # first touch the runtime file to show we are still running: 3443 # first touch the runtime file to show we are still running:
2982 # the fsync below can take a very very long time. 3444 # the fsync below can take a very very long time.
2983 3445
2984 IO::AIO::aio_utime $runtime, undef, undef; 3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2985 3447
2986 my $guard = cf::lock_acquire "write_runtime"; 3448 my $guard = cf::lock_acquire "write_runtime";
2987 3449
2988 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2989 or return; 3451 or return;
2990 3452
2991 my $value = $cf::RUNTIME + 90 + 10; 3453 my $value = $cf::RUNTIME + 90 + 10;
2992 # 10 is the runtime save interval, for a monotonic clock 3454 # 10 is the runtime save interval, for a monotonic clock
2993 # 60 allows for the watchdog to kill the server. 3455 # 60 allows for the watchdog to kill the server.
3003 aio_utime $fh, undef, undef; 3465 aio_utime $fh, undef, undef;
3004 3466
3005 close $fh 3467 close $fh
3006 or return; 3468 or return;
3007 3469
3008 aio_rename "$runtime~", $runtime 3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3009 and return; 3471 and return;
3010 3472
3011 warn "runtime file written.\n"; 3473 warn "runtime file written.\n";
3012 3474
3013 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 };
3014} 3519}
3015 3520
3016sub emergency_save() { 3521sub emergency_save() {
3017 my $freeze_guard = cf::freeze_mainloop; 3522 my $freeze_guard = cf::freeze_mainloop;
3018 3523
3024 # and maps saved/destroyed asynchronously. 3529 # and maps saved/destroyed asynchronously.
3025 warn "begin emergency player save\n"; 3530 warn "begin emergency player save\n";
3026 for my $login (keys %cf::PLAYER) { 3531 for my $login (keys %cf::PLAYER) {
3027 my $pl = $cf::PLAYER{$login} or next; 3532 my $pl = $cf::PLAYER{$login} or next;
3028 $pl->valid or next; 3533 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3029 $pl->save; 3535 $pl->save;
3030 } 3536 }
3031 warn "end emergency player save\n"; 3537 warn "end emergency player save\n";
3032 3538
3033 warn "begin emergency map save\n"; 3539 warn "begin emergency map save\n";
3039 warn "end emergency map save\n"; 3545 warn "end emergency map save\n";
3040 3546
3041 warn "begin emergency database checkpoint\n"; 3547 warn "begin emergency database checkpoint\n";
3042 BDB::db_env_txn_checkpoint $DB_ENV; 3548 BDB::db_env_txn_checkpoint $DB_ENV;
3043 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";
3044 }; 3554 };
3045 3555
3046 warn "leave emergency perl save\n"; 3556 warn "leave emergency perl save\n";
3047} 3557}
3048 3558
3049sub post_cleanup { 3559sub post_cleanup {
3050 my ($make_core) = @_; 3560 my ($make_core) = @_;
3051 3561
3052 warn Carp::longmess "post_cleanup backtrace" 3562 warn Carp::longmess "post_cleanup backtrace"
3053 if $make_core; 3563 if $make_core;
3564
3565 my $fh = pidfile;
3566 unlink $PIDFILE if <$fh> == $$;
3054} 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
3055 3596
3056sub do_reload_perl() { 3597sub do_reload_perl() {
3057 # can/must only be called in main 3598 # can/must only be called in main
3058 if ($Coro::current != $Coro::main) { 3599 if ($Coro::current != $Coro::main) {
3059 warn "can only reload from main coroutine"; 3600 warn "can only reload from main coroutine";
3060 return; 3601 return;
3061 } 3602 }
3062 3603
3604 return if $RELOAD++;
3605
3606 while ($RELOAD) {
3063 warn "reloading..."; 3607 warn "reloading...";
3064 3608
3065 warn "entering sync_job"; 3609 warn "entering sync_job";
3066 3610
3067 cf::sync_job { 3611 cf::sync_job {
3068 cf::write_runtime; # external watchdog should not bark 3612 cf::write_runtime_sync; # external watchdog should not bark
3069 cf::emergency_save; 3613 cf::emergency_save;
3070 cf::write_runtime; # external watchdog should not bark 3614 cf::write_runtime_sync; # external watchdog should not bark
3071 3615
3072 warn "syncing database to disk"; 3616 warn "syncing database to disk";
3073 BDB::db_env_txn_checkpoint $DB_ENV; 3617 BDB::db_env_txn_checkpoint $DB_ENV;
3074 3618
3075 # 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
3076 3620
3077 warn "cancelling all WF_AUTOCANCEL watchers";
3078 for (Event::all_watchers) {
3079 $_->cancel if $_->data & WF_AUTOCANCEL;
3080 }
3081
3082 warn "flushing outstanding aio requests"; 3621 warn "flushing outstanding aio requests";
3083 for (;;) {
3084 BDB::flush;
3085 IO::AIO::flush;
3086 Coro::cede;
3087 last unless IO::AIO::nreqs || BDB::nreqs; 3622 while (IO::AIO::nreqs || BDB::nreqs) {
3088 warn "iterate..."; 3623 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3089 }
3090
3091 ++$RELOAD;
3092
3093 warn "cancelling all extension coros";
3094 $_->cancel for values %EXT_CORO;
3095 %EXT_CORO = ();
3096
3097 warn "removing commands";
3098 %COMMAND = ();
3099
3100 warn "removing ext/exti commands";
3101 %EXTCMD = ();
3102 %EXTICMD = ();
3103
3104 warn "unloading/nuking all extensions";
3105 for my $pkg (@EXTS) {
3106 warn "... unloading $pkg";
3107
3108 if (my $cb = $pkg->can ("unload")) {
3109 eval {
3110 $cb->($pkg);
3111 1
3112 } or warn "$pkg unloaded, but with errors: $@";
3113 } 3624 }
3114 3625
3115 warn "... nuking $pkg"; 3626 warn "cancelling all extension coros";
3116 Symbol::delete_package $pkg; 3627 $_->cancel for values %EXT_CORO;
3117 } 3628 %EXT_CORO = ();
3118 3629
3119 warn "unloading all perl modules loaded from $LIBDIR"; 3630 warn "removing commands";
3120 while (my ($k, $v) = each %INC) { 3631 %COMMAND = ();
3121 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3122 3632
3633 warn "removing ext/exti commands";
3634 %EXTCMD = ();
3635 %EXTICMD = ();
3636
3637 warn "unloading/nuking all extensions";
3638 for my $pkg (@EXTS) {
3123 warn "... unloading $k"; 3639 warn "... unloading $pkg";
3124 delete $INC{$k};
3125 3640
3126 $k =~ s/\.pm$//;
3127 $k =~ s/\//::/g;
3128
3129 if (my $cb = $k->can ("unload_module")) { 3641 if (my $cb = $pkg->can ("unload")) {
3642 eval {
3130 $cb->(); 3643 $cb->($pkg);
3644 1
3645 } or warn "$pkg unloaded, but with errors: $@";
3646 }
3647
3648 warn "... clearing $pkg";
3649 clear_package $pkg;
3131 } 3650 }
3132 3651
3133 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;
3134 } 3667 }
3135 3668
3136 warn "getting rid of safe::, as good as possible"; 3669 warn "getting rid of safe::, as good as possible";
3137 Symbol::delete_package "safe::$_" 3670 clear_package "safe::$_"
3138 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);
3139 3672
3140 warn "unloading cf.pm \"a bit\""; 3673 warn "unloading cf.pm \"a bit\"";
3141 delete $INC{"cf.pm"}; 3674 delete $INC{"cf.pm"};
3142 delete $INC{"cf/pod.pm"}; 3675 delete $INC{"cf/pod.pm"};
3143 3676
3144 # don't, removes xs symbols, too, 3677 # don't, removes xs symbols, too,
3145 # and global variables created in xs 3678 # and global variables created in xs
3146 #Symbol::delete_package __PACKAGE__; 3679 #clear_package __PACKAGE__;
3147 3680
3148 warn "unload completed, starting to reload now"; 3681 warn "unload completed, starting to reload now";
3149 3682
3150 warn "reloading cf.pm"; 3683 warn "reloading cf.pm";
3151 require cf; 3684 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3686
3154 warn "loading config and database again"; 3687 warn "loading config and database again";
3155 cf::cfg_load; 3688 cf::reload_config;
3156 3689
3157 warn "loading extensions"; 3690 warn "loading extensions";
3158 cf::load_extensions; 3691 cf::load_extensions;
3159 3692
3160 warn "reattaching attachments to objects/players"; 3693 warn "reattaching attachments to objects/players";
3161 _global_reattach; # objects, sockets 3694 _global_reattach; # objects, sockets
3162 warn "reattaching attachments to maps"; 3695 warn "reattaching attachments to maps";
3163 reattach $_ for values %MAP; 3696 reattach $_ for values %MAP;
3164 warn "reattaching attachments to players"; 3697 warn "reattaching attachments to players";
3165 reattach $_ for values %PLAYER; 3698 reattach $_ for values %PLAYER;
3166 3699
3167 warn "leaving sync_job"; 3700 warn "leaving sync_job";
3168 3701
3169 1 3702 1
3170 } or do { 3703 } or do {
3171 warn $@; 3704 warn $@;
3172 warn "error while reloading, exiting."; 3705 cf::cleanup "error while reloading, exiting.";
3173 exit 1;
3174 }; 3706 };
3175 3707
3176 warn "reloaded"; 3708 warn "reloaded";
3709 --$RELOAD;
3710 }
3177}; 3711};
3178 3712
3179our $RELOAD_WATCHER; # used only during reload 3713our $RELOAD_WATCHER; # used only during reload
3180 3714
3181sub reload_perl() { 3715sub reload_perl() {
3182 # doing reload synchronously and two reloads happen back-to-back, 3716 # doing reload synchronously and two reloads happen back-to-back,
3183 # coro crashes during coro_state_free->destroy here. 3717 # coro crashes during coro_state_free->destroy here.
3184 3718
3185 $RELOAD_WATCHER ||= Event->timer ( 3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3186 reentrant => 0,
3187 after => 0,
3188 data => WF_AUTOCANCEL,
3189 cb => sub {
3190 do_reload_perl; 3720 do_reload_perl;
3191 undef $RELOAD_WATCHER; 3721 undef $RELOAD_WATCHER;
3192 },
3193 ); 3722 };
3194} 3723}
3195 3724
3196register_command "reload" => sub { 3725register_command "reload" => sub {
3197 my ($who, $arg) = @_; 3726 my ($who, $arg) = @_;
3198 3727
3199 if ($who->flag (FLAG_WIZ)) { 3728 if ($who->flag (FLAG_WIZ)) {
3200 $who->message ("reloading server."); 3729 $who->message ("reloading server.");
3730 async {
3731 $Coro::current->{desc} = "perl_reload";
3201 async { reload_perl }; 3732 reload_perl;
3733 };
3202 } 3734 }
3203}; 3735};
3204 3736
3205unshift @INC, $LIBDIR; 3737unshift @INC, $LIBDIR;
3206 3738
3208 3740
3209our @WAIT_FOR_TICK; 3741our @WAIT_FOR_TICK;
3210our @WAIT_FOR_TICK_BEGIN; 3742our @WAIT_FOR_TICK_BEGIN;
3211 3743
3212sub wait_for_tick { 3744sub wait_for_tick {
3213 return unless $TICK_WATCHER->is_active;
3214 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3215 3746
3216 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3217 push @WAIT_FOR_TICK, $signal; 3748 push @WAIT_FOR_TICK, $signal;
3218 $signal->wait; 3749 $signal->wait;
3219} 3750}
3220 3751
3221sub wait_for_tick_begin { 3752sub wait_for_tick_begin {
3222 return unless $TICK_WATCHER->is_active;
3223 return if $Coro::current == $Coro::main; 3753 return if tick_inhibit || $Coro::current == $Coro::main;
3224 3754
3225 my $signal = new Coro::Signal; 3755 my $signal = new Coro::Signal;
3226 push @WAIT_FOR_TICK_BEGIN, $signal; 3756 push @WAIT_FOR_TICK_BEGIN, $signal;
3227 $signal->wait; 3757 $signal->wait;
3228} 3758}
3229 3759
3230 my $min = 1e6;#d# 3760sub tick {
3231 my $avg = 10;
3232$TICK_WATCHER = Event->timer (
3233 reentrant => 0,
3234 parked => 1,
3235 prio => 0,
3236 at => $NEXT_TICK || $TICK,
3237 data => WF_AUTOCANCEL,
3238 cb => sub {
3239 if ($Coro::current != $Coro::main) { 3761 if ($Coro::current != $Coro::main) {
3240 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"
3241 unless ++$bug_warning > 10; 3763 unless ++$bug_warning > 10;
3242 return; 3764 return;
3243 } 3765 }
3244 3766
3245 $NOW = $tick_start = Event::time;
3246
3247 cf::server_tick; # one server iteration 3767 cf::server_tick; # one server iteration
3248 3768
3249 0 && sync_job {#d# 3769 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3250 for(1..10) { 3770 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3251 my $t = Event::time; 3771 Coro::async_pool {
3252 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3772 $Coro::current->{desc} = "runtime saver";
3253 or die; 3773 write_runtime_sync
3254 3774 or warn "ERROR: unable to write runtime file: $!";
3255 $map->width (50);
3256 $map->height (50);
3257 $map->alloc;
3258 $map->_load_objects ("/tmp/x.map", 1);
3259 my $t = Event::time - $t;
3260
3261 #next unless $t < 0.0013;#d#
3262 if ($t < $min) {
3263 $min = $t;
3264 }
3265 $avg = $avg * 0.99 + $t * 0.01;
3266 }
3267 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3268 exit 0;
3269 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3270 }; 3775 };
3776 }
3271 3777
3272 $RUNTIME += $TICK;
3273 $NEXT_TICK += $TICK;
3274
3275 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3276 $NEXT_RUNTIME_WRITE = $NOW + 10;
3277 Coro::async_pool {
3278 write_runtime
3279 or warn "ERROR: unable to write runtime file: $!";
3280 };
3281 }
3282
3283# my $AFTER = Event::time;
3284# warn $AFTER - $NOW;#d#
3285
3286 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3778 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287 $sig->send; 3779 $sig->send;
3288 } 3780 }
3289 while (my $sig = shift @WAIT_FOR_TICK) { 3781 while (my $sig = shift @WAIT_FOR_TICK) {
3290 $sig->send; 3782 $sig->send;
3291 } 3783 }
3292 3784
3293 $NOW = Event::time; 3785 $LOAD = ($NOW - $TICK_START) / $TICK;
3294
3295 # if we are delayed by four ticks or more, skip them all
3296 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3297
3298 $TICK_WATCHER->at ($NEXT_TICK);
3299 $TICK_WATCHER->start;
3300
3301 $LOAD = ($NOW - $tick_start) / $TICK;
3302 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3786 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3303 3787
3304 _post_tick; 3788 if (0) {
3305 3789 if ($NEXT_TICK) {
3306 3790 my $jitter = $TICK_START - $NEXT_TICK;
3791 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3792 warn "jitter $JITTER\n";#d#
3793 }
3307 }, 3794 }
3308); 3795}
3309 3796
3310{ 3797{
3311 BDB::max_poll_time $TICK * 0.1; 3798 # configure BDB
3312 $BDB_POLL_WATCHER = Event->io ( 3799
3313 reentrant => 0,
3314 fd => BDB::poll_fileno,
3315 poll => 'r',
3316 prio => 0,
3317 data => WF_AUTOCANCEL,
3318 cb => \&BDB::poll_cb,
3319 );
3320 BDB::min_parallel 8; 3800 BDB::min_parallel 8;
3321 3801 BDB::max_poll_reqs $TICK * 0.1;
3322 BDB::set_sync_prepare { 3802 $AnyEvent::BDB::WATCHER->priority (1);
3323 my $status;
3324 my $current = $Coro::current;
3325 (
3326 sub {
3327 $status = $!;
3328 $current->ready; undef $current;
3329 },
3330 sub {
3331 Coro::schedule while defined $current;
3332 $! = $status;
3333 },
3334 )
3335 };
3336 3803
3337 unless ($DB_ENV) { 3804 unless ($DB_ENV) {
3338 $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);
3339 3811
3340 cf::sync_job { 3812 cf::sync_job {
3341 eval { 3813 eval {
3342 BDB::db_env_open 3814 BDB::db_env_open
3343 $DB_ENV, 3815 $DB_ENV,
3345 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
3346 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3818 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3347 0666; 3819 0666;
3348 3820
3349 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3821 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3350
3351 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3352 $DB_ENV->set_lk_detect;
3353 }; 3822 };
3354 3823
3355 cf::cleanup "db_env_open(db): $@" if $@; 3824 cf::cleanup "db_env_open(db): $@" if $@;
3356 }; 3825 };
3357 } 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 };
3358} 3837}
3359 3838
3360{ 3839{
3840 # configure IO::AIO
3841
3361 IO::AIO::min_parallel 8; 3842 IO::AIO::min_parallel 8;
3362
3363 undef $Coro::AIO::WATCHER;
3364 IO::AIO::max_poll_time $TICK * 0.1; 3843 IO::AIO::max_poll_time $TICK * 0.1;
3365 $AIO_POLL_WATCHER = Event->io ( 3844 undef $AnyEvent::AIO::WATCHER;
3366 reentrant => 0,
3367 data => WF_AUTOCANCEL,
3368 fd => IO::AIO::poll_fileno,
3369 poll => 'r',
3370 prio => 6,
3371 cb => \&IO::AIO::poll_cb,
3372 );
3373} 3845}
3374 3846
3375my $_log_backtrace; 3847my $_log_backtrace;
3376 3848
3377sub _log_backtrace { 3849sub _log_backtrace {
3380 $msg =~ s/\n//; 3852 $msg =~ s/\n//;
3381 3853
3382 # limit the # of concurrent backtraces 3854 # limit the # of concurrent backtraces
3383 if ($_log_backtrace < 2) { 3855 if ($_log_backtrace < 2) {
3384 ++$_log_backtrace; 3856 ++$_log_backtrace;
3857 my $perl_bt = Carp::longmess $msg;
3385 async { 3858 async {
3859 $Coro::current->{desc} = "abt $msg";
3860
3386 my @bt = fork_call { 3861 my @bt = fork_call {
3387 @addr = map { sprintf "%x", $_ } @addr; 3862 @addr = map { sprintf "%x", $_ } @addr;
3388 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3863 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3389 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 |"
3390 or die "addr2line: $!"; 3865 or die "addr2line: $!";
3398 } 3873 }
3399 3874
3400 @funcs 3875 @funcs
3401 }; 3876 };
3402 3877
3403 LOG llevInfo, "[ABT] $msg\n"; 3878 LOG llevInfo, "[ABT] $perl_bt\n";
3879 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3404 LOG llevInfo, "[ABT] $_\n" for @bt; 3880 LOG llevInfo, "[ABT] $_\n" for @bt;
3405 --$_log_backtrace; 3881 --$_log_backtrace;
3406 }; 3882 };
3407 } else { 3883 } else {
3408 LOG llevInfo, "[ABT] $msg\n"; 3884 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines