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.286 by root, Sun Jun 24 04:27:20 2007 UTC vs.
Revision 1.448 by root, Fri Sep 19 05:30:23 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.61 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
49use Coro::Util ();
24 50
51use JSON::XS 2.01 ();
25use BDB (); 52use BDB ();
26use Data::Dumper; 53use Data::Dumper;
27use Digest::MD5; 54use Digest::MD5;
28use Fcntl; 55use Fcntl;
29use YAML::Syck (); 56use YAML ();
30use IO::AIO 2.32 (); 57use IO::AIO ();
31use Time::HiRes; 58use Time::HiRes;
32use Compress::LZF; 59use Compress::LZF;
60use Digest::MD5 ();
61
62AnyEvent::detect;
33 63
34# configure various modules to our taste 64# configure various modules to our taste
35# 65#
36$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44 68
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71{
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve";
85 Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
86}
46 87
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 89
49our %COMMAND = (); 90our %COMMAND = ();
50our %COMMAND_TIME = (); 91our %COMMAND_TIME = ();
51 92
52our @EXTS = (); # list of extension package names 93our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 94our %EXTCMD = ();
95our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 96our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 97our %EXT_MAP = (); # pluggable maps
56 98
57our $RELOAD; # number of reloads so far 99our $RELOAD; # number of reloads so far
58our @EVENT; 100our @EVENT;
59 101
60our $CONFDIR = confdir; 102our $CONFDIR = confdir;
61our $DATADIR = datadir; 103our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 107our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 108our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 109our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 110our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 111our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 112our $BDBDIR = "$LOCALDIR/db";
113our $PIDFILE = "$LOCALDIR/pid";
114our $RUNTIMEFILE = "$LOCALDIR/runtime";
115
116our %RESOURCE;
71 117
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 118our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 120our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 121our $USE_FSYNC = 1; # use fsync to write maps - default off
79 122
123our $BDB_DEADLOCK_WATCHER;
124our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 125our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 126our $DB_ENV;
82 127
83our %CFG; 128our %CFG;
84 129
85our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 131our $RUNTIME;
132our $NOW;
87 133
88our %PLAYER; # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 135our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
91 137
92# 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 ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 140
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
98 145
99binmode STDOUT; 146binmode STDOUT;
100binmode STDERR; 147binmode STDERR;
101 148
102# read virtual server time, if available 149# read virtual server time, if available
103unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 150unless ($RUNTIME || !-e $RUNTIMEFILE) {
104 open my $fh, "<", "$LOCALDIR/runtime" 151 open my $fh, "<", $RUNTIMEFILE
105 or die "unable to read runtime file: $!"; 152 or die "unable to read $RUNTIMEFILE file: $!";
106 $RUNTIME = <$fh> + 0.; 153 $RUNTIME = <$fh> + 0.;
107} 154}
108 155
109mkdir $_ 156mkdir $_
110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
155 202
156The raw value load value from the last tick. 203The raw value load value from the last tick.
157 204
158=item %cf::CFG 205=item %cf::CFG
159 206
160Configuration for the server, loaded from C</etc/crossfire/config>, or 207Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 208from wherever your confdir points to.
162 209
163=item cf::wait_for_tick, cf::wait_for_tick_begin 210=item cf::wait_for_tick, cf::wait_for_tick_begin
164 211
165These 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
166returns directly I<after> the tick processing (and consequently, can only wake one process 213returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 214per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 215
216=item @cf::INVOKE_RESULTS
217
218This array contains the results of the last C<invoke ()> call. When
219C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
220that call.
221
169=back 222=back
170 223
171=cut 224=cut
172 225
173BEGIN { 226BEGIN {
177 $msg .= "\n" 230 $msg .= "\n"
178 unless $msg =~ /\n$/; 231 unless $msg =~ /\n$/;
179 232
180 $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;
181 234
182 utf8::encode $msg;
183 LOG llevError, $msg; 235 LOG llevError, $msg;
184 }; 236 };
185} 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#?
186 253
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 254@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 255@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 256@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 257@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
197for my $pkg (qw( 264for my $pkg (qw(
198 cf::global cf::attachable 265 cf::global cf::attachable
199 cf::object cf::object::player 266 cf::object cf::object::player
200 cf::client cf::player 267 cf::client cf::player
201 cf::arch cf::living 268 cf::arch cf::living
269 cf::map cf::mapspace
202 cf::map cf::party cf::region 270 cf::party cf::region
203)) { 271)) {
204 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 272 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 273}
207 274
208$Event::DIED = sub { 275$EV::DIED = sub {
209 warn "error in event callback: @_"; 276 warn "error in event callback: @_";
210}; 277};
211 278
212############################################################################# 279#############################################################################
213 280
236 $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;
237 $d 304 $d
238 } || "[unable to dump $_[0]: '$@']"; 305 } || "[unable to dump $_[0]: '$@']";
239} 306}
240 307
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 308=item $ref = cf::decode_json $json
244 309
245Converts a JSON string into the corresponding perl data structure. 310Converts a JSON string into the corresponding perl data structure.
246 311
247=item $json = cf::to_json $ref 312=item $json = cf::encode_json $ref
248 313
249Converts a perl data structure into its JSON representation. 314Converts a perl data structure into its JSON representation.
315
316=cut
317
318our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
319
320sub encode_json($) { $json_coder->encode ($_[0]) }
321sub decode_json($) { $json_coder->decode ($_[0]) }
250 322
251=item cf::lock_wait $string 323=item cf::lock_wait $string
252 324
253Wait until the given lock is available. See cf::lock_acquire. 325Wait until the given lock is available. See cf::lock_acquire.
254 326
257Wait 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
258a 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,
259for example when the coroutine gets canceled), the lock is automatically 331for example when the coroutine gets canceled), the lock is automatically
260returned. 332returned.
261 333
334Locks are *not* recursive, locking from the same coro twice results in a
335deadlocked coro.
336
262Lock 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
263uses map_find and cf::map::load uses map_load). 338uses map_find and cf::map::load uses map_load).
264 339
265=item $locked = cf::lock_active $string 340=item $locked = cf::lock_active $string
266 341
267Return 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.
268 343
269=cut 344=cut
270 345
271our %LOCK; 346our %LOCK;
347our %LOCKER;#d#
272 348
273sub lock_wait($) { 349sub lock_wait($) {
274 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#
275 356
276 # wait for lock, if any 357 # wait for lock, if any
277 while ($LOCK{$key}) { 358 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current; 359 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule; 360 Coro::schedule;
285 366
286 # wait, to be sure we are not locked 367 # wait, to be sure we are not locked
287 lock_wait $key; 368 lock_wait $key;
288 369
289 $LOCK{$key} = []; 370 $LOCK{$key} = [];
371 $LOCKER{$key} = $Coro::current;#d#
290 372
291 Coro::guard { 373 Coro::guard {
374 delete $LOCKER{$key};#d#
292 # wake up all waiters, to be on the safe side 375 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} }; 376 $_->ready for @{ delete $LOCK{$key} };
294 } 377 }
295} 378}
296 379
299 382
300 ! ! $LOCK{$key} 383 ! ! $LOCK{$key}
301} 384}
302 385
303sub freeze_mainloop { 386sub freeze_mainloop {
304 return unless $TICK_WATCHER->is_active; 387 tick_inhibit_inc;
305 388
306 my $guard = Coro::guard { 389 Coro::guard \&tick_inhibit_dec;
307 $TICK_WATCHER->start; 390}
391
392=item cf::periodic $interval, $cb
393
394Like EV::periodic, but randomly selects a starting point so that the actions
395get spread over timer.
396
397=cut
398
399sub periodic($$) {
400 my ($interval, $cb) = @_;
401
402 my $start = rand List::Util::min 180, $interval;
403
404 EV::periodic $start, $interval, 0, $cb
405}
406
407=item cf::get_slot $time[, $priority[, $name]]
408
409Allocate $time seconds of blocking CPU time at priority C<$priority>:
410This call blocks and returns only when you have at least C<$time> seconds
411of cpu time till the next tick. The slot is only valid till the next cede.
412
413The optional C<$name> can be used to identify the job to run. It might be
414used for statistical purposes and should identify the same time-class.
415
416Useful for short background jobs.
417
418=cut
419
420our @SLOT_QUEUE;
421our $SLOT_QUEUE;
422
423$SLOT_QUEUE->cancel if $SLOT_QUEUE;
424$SLOT_QUEUE = Coro::async {
425 $Coro::current->desc ("timeslot manager");
426
427 my $signal = new Coro::Signal;
428
429 while () {
430 next_job:
431 my $avail = cf::till_tick;
432 if ($avail > 0.01) {
433 for (0 .. $#SLOT_QUEUE) {
434 if ($SLOT_QUEUE[$_][0] < $avail) {
435 my $job = splice @SLOT_QUEUE, $_, 1, ();
436 $job->[2]->send;
437 Coro::cede;
438 goto next_job;
439 }
440 }
441 }
442
443 if (@SLOT_QUEUE) {
444 # we do not use wait_for_tick() as it returns immediately when tick is inactive
445 push @cf::WAIT_FOR_TICK, $signal;
446 $signal->wait;
447 } else {
448 Coro::schedule;
449 }
308 }; 450 }
309 $TICK_WATCHER->stop; 451};
310 $guard 452
453sub get_slot($;$$) {
454 return if tick_inhibit || $Coro::current == $Coro::main;
455
456 my ($time, $pri, $name) = @_;
457
458 $time = $TICK * .6 if $time > $TICK * .6;
459 my $sig = new Coro::Signal;
460
461 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
462 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
463 $SLOT_QUEUE->ready;
464 $sig->wait;
311} 465}
312 466
313=item cf::async { BLOCK } 467=item cf::async { BLOCK }
314 468
315Currently the same as Coro::async_pool, meaning you cannot use 469Currently the same as Coro::async_pool, meaning you cannot use
320 474
321BEGIN { *async = \&Coro::async_pool } 475BEGIN { *async = \&Coro::async_pool }
322 476
323=item cf::sync_job { BLOCK } 477=item cf::sync_job { BLOCK }
324 478
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 479The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 480is always able to handle events or runnable, as Deliantra is only
327partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 481partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable. 482acceptable.
329 483
330If 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
331the given BLOCK in another coroutine while waiting for the result. The 485the given BLOCK in another coroutine while waiting for the result. The
336 490
337sub sync_job(&) { 491sub sync_job(&) {
338 my ($job) = @_; 492 my ($job) = @_;
339 493
340 if ($Coro::current == $Coro::main) { 494 if ($Coro::current == $Coro::main) {
341 my $time = Event::time; 495 my $time = EV::time;
342 496
343 # this is the main coro, too bad, we have to block 497 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 498 # till the operation succeeds, freezing the server :/
345 499
346 # TODO: use suspend/resume instead 500 LOG llevError, Carp::longmess "sync job";#d#
347 # (but this is cancel-safe) 501
348 my $freeze_guard = freeze_mainloop; 502 my $freeze_guard = freeze_mainloop;
349 503
350 my $busy = 1; 504 my $busy = 1;
351 my @res; 505 my @res;
352 506
353 (async { 507 (async {
508 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 509 @res = eval { $job->() };
355 warn $@ if $@; 510 warn $@ if $@;
356 undef $busy; 511 undef $busy;
357 })->prio (Coro::PRIO_MAX); 512 })->prio (Coro::PRIO_MAX);
358 513
359 while ($busy) { 514 while ($busy) {
360 Coro::cede or Event::one_event; 515 if (Coro::nready) {
516 Coro::cede_notself;
517 } else {
518 EV::loop EV::LOOP_ONESHOT;
361 } 519 }
520 }
362 521
363 $time = Event::time - $time; 522 my $time = EV::time - $time;
364 523
365 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367
368 $tick_start += $time; # do not account sync jobs to server load 524 $TICK_START += $time; # do not account sync jobs to server load
369 525
370 wantarray ? @res : $res[0] 526 wantarray ? @res : $res[0]
371 } else { 527 } else {
372 # we are in another coroutine, how wonderful, everything just works 528 # we are in another coroutine, how wonderful, everything just works
373 529
398=item fork_call { }, $args 554=item fork_call { }, $args
399 555
400Executes the given code block with the given arguments in a seperate 556Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 557process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 558Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 559never block itself or use any form of event handling.
404 560
405=cut 561=cut
406 562
407sub fork_call(&@) { 563sub fork_call(&@) {
408 my ($cb, @args) = @_; 564 my ($cb, @args) = @_;
409 565
410# 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,
411# or die "socketpair: $!"; 567 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 568 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 569
415 if (my $pid = fork) { 570 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 571 reset_signals;
428 local $SIG{__WARN__}; 572 &$cb
429 local $SIG{__DIE__}; 573 }, @args;
430 eval {
431 close $fh1;
432 574
433 my @res = eval { $cb->(@args) }; 575 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 576}
435 };
436 577
437 warn $@ if $@; 578=item $coin = coin_from_name $name
438 _exit 0; 579
439 } 580=cut
581
582our %coin_alias = (
583 "silver" => "silvercoin",
584 "silvercoin" => "silvercoin",
585 "silvercoins" => "silvercoin",
586 "gold" => "goldcoin",
587 "goldcoin" => "goldcoin",
588 "goldcoins" => "goldcoin",
589 "platinum" => "platinacoin",
590 "platinumcoin" => "platinacoin",
591 "platinumcoins" => "platinacoin",
592 "platina" => "platinacoin",
593 "platinacoin" => "platinacoin",
594 "platinacoins" => "platinacoin",
595 "royalty" => "royalty",
596 "royalties" => "royalty",
597);
598
599sub coin_from_name($) {
600 $coin_alias{$_[0]}
601 ? cf::arch::find $coin_alias{$_[0]}
602 : undef
440} 603}
441 604
442=item $value = cf::db_get $family => $key 605=item $value = cf::db_get $family => $key
443 606
444Returns a single value from the environment database. 607Returns a single value from the environment database.
446=item cf::db_put $family => $key => $value 609=item cf::db_put $family => $key => $value
447 610
448Stores 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
449data 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).
450 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
451=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}
452 637
453our $DB; 638our $DB;
454 639
455sub db_init { 640sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 641 cf::sync_job {
460 eval { 642 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 643 };
470} 644}
471 645
472sub db_get($$) { 646sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 647 my $key = "$_[0]/$_[1]";
474 648
524 if (1) { 698 if (1) {
525 $md5 = 699 $md5 =
526 join "\x00", 700 join "\x00",
527 $processversion, 701 $processversion,
528 map { 702 map {
529 Coro::cede; 703 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 704 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 705 } 0.. $#$src;
532 706
533 707
534 my $dbmd5 = db_get cache => "$id/md5"; 708 my $dbmd5 = db_get cache => "$id/md5";
572 746
573############################################################################# 747#############################################################################
574 748
575=head2 ATTACHABLE OBJECTS 749=head2 ATTACHABLE OBJECTS
576 750
577Many 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
578attach callbacks/event handlers (a collection of which is called an "attachment") 752attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 753to it. All such attachable objects support the following methods.
580 754
581In 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>
582C<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
583Crossfire TRT). 757Deliantra).
584 758
585=over 4 759=over 4
586 760
587=item $attachable->attach ($attachment, key => $value...) 761=item $attachable->attach ($attachment, key => $value...)
588 762
632=item cf::CLASS::attachment $name, ... 806=item cf::CLASS::attachment $name, ...
633 807
634Register an attachment by C<$name> through which attachable objects of the 808Register an attachment by C<$name> through which attachable objects of the
635given CLASS can refer to this attachment. 809given CLASS can refer to this attachment.
636 810
637Some classes such as crossfire maps and objects can specify attachments 811Some classes such as deliantra maps and objects can specify attachments
638that 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.
639 813
640These calls expect any number of the following handler/hook descriptions: 814These calls expect any number of the following handler/hook descriptions:
641 815
642=over 4 816=over 4
840 "; 1014 ";
841 die if $@; 1015 die if $@;
842} 1016}
843 1017
844our $override; 1018our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1019our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 1020
847sub override { 1021sub override {
848 $override = 1; 1022 $override = 1;
849 @invoke_results = (); 1023 @INVOKE_RESULTS = (@_);
850} 1024}
851 1025
852sub do_invoke { 1026sub do_invoke {
853 my $event = shift; 1027 my $event = shift;
854 my $callbacks = shift; 1028 my $callbacks = shift;
855 1029
856 @invoke_results = (); 1030 @INVOKE_RESULTS = ();
857 1031
858 local $override; 1032 local $override;
859 1033
860 for (@$callbacks) { 1034 for (@$callbacks) {
861 eval { &{$_->[1]} }; 1035 eval { &{$_->[1]} };
870 } 1044 }
871 1045
872 0 1046 0
873} 1047}
874 1048
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1049=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 1050
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1051=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 1052
879Generate an object-specific event with the given arguments. 1053Generate an object-specific event with the given arguments.
880 1054
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1055This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 1056removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 1057results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 1058
885=back 1059=back
886 1060
887=cut 1061=cut
888 1062
889############################################################################# 1063#############################################################################
890# object support 1064# object support
1065
1066sub _object_equal($$);
1067sub _object_equal($$) {
1068 my ($a, $b) = @_;
1069
1070 return 0 unless (ref $a) eq (ref $b);
1071
1072 if ("HASH" eq ref $a) {
1073 my @ka = keys %$a;
1074 my @kb = keys %$b;
1075
1076 return 0 if @ka != @kb;
1077
1078 for (0 .. $#ka) {
1079 return 0 unless $ka[$_] eq $kb[$_];
1080 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1081 }
1082
1083 } elsif ("ARRAY" eq ref $a) {
1084
1085 return 0 if @$a != @$b;
1086
1087 for (0 .. $#$a) {
1088 return 0 unless _object_equal $a->[$_], $b->[$_];
1089 }
1090
1091 } elsif ($a ne $b) {
1092 return 0;
1093 }
1094
1095 1
1096}
1097
1098our $SLOW_MERGES;#d#
1099sub _can_merge {
1100 my ($ob1, $ob2) = @_;
1101
1102 ++$SLOW_MERGES;#d#
1103
1104 # we do the slow way here
1105 return _object_equal $ob1, $ob2
1106}
891 1107
892sub reattach { 1108sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1109 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1110 my ($obj) = @_;
895 1111
1112 # no longer needed after getting rid of delete_package?
896 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
897 1114
898 my $registry = $obj->registry; 1115 my $registry = $obj->registry;
899 1116
900 @$registry = (); 1117 @$registry = ();
901 1118
916cf::attachable->attach ( 1133cf::attachable->attach (
917 prio => -1000000, 1134 prio => -1000000,
918 on_instantiate => sub { 1135 on_instantiate => sub {
919 my ($obj, $data) = @_; 1136 my ($obj, $data) = @_;
920 1137
921 $data = from_json $data; 1138 $data = decode_json $data;
922 1139
923 for (@$data) { 1140 for (@$data) {
924 my ($name, $args) = @$_; 1141 my ($name, $args) = @$_;
925 1142
926 $obj->attach ($name, %{$args || {} }); 1143 $obj->attach ($name, %{$args || {} });
942sub object_freezer_save { 1159sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1160 my ($filename, $rdata, $objs) = @_;
944 1161
945 sync_job { 1162 sync_job {
946 if (length $$rdata) { 1163 if (length $$rdata) {
1164 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1165 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1166 $decname, length $$rdata, scalar @$objs;
949 1167
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1169 aio_chmod $fh, SAVE_MODE;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1171 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1172 aio_close $fh;
955 1173
956 if (@$objs) { 1174 if (@$objs) {
957 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) {
958 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1178 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1179 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1180 aio_close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1181 aio_rename "$filename.pst~", "$filename.pst";
964 } 1182 }
965 } else { 1183 } else {
966 aio_unlink "$filename.pst"; 1184 aio_unlink "$filename.pst";
967 } 1185 }
972 } 1190 }
973 } else { 1191 } else {
974 aio_unlink $filename; 1192 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1193 aio_unlink "$filename.pst";
976 } 1194 }
977 } 1195 };
978} 1196}
979 1197
980sub object_freezer_as_string { 1198sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1199 my ($rdata, $objs) = @_;
982 1200
994 or return; 1212 or return;
995 1213
996 unless (aio_stat "$filename.pst") { 1214 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1215 (aio_load "$filename.pst", $av) >= 0
998 or return; 1216 or return;
1217
999 $av = eval { (Storable::thaw $av)->{objs} }; 1218 my $st = eval { Coro::Storable::thaw $av };
1219 $av = $st->{objs};
1000 } 1220 }
1001 1221
1222 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1223 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1224 $decname, length $data, scalar @{$av || []};
1225
1004 return ($data, $av); 1226 ($data, $av)
1005} 1227}
1006 1228
1007=head2 COMMAND CALLBACKS 1229=head2 COMMAND CALLBACKS
1008 1230
1009=over 4 1231=over 4
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1251 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1252}
1031 1253
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1254=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1255
1034Register a callback fro execution when the client sends an extcmd packet. 1256Register a callback for execution when the client sends an (synchronous)
1257extcmd packet. Ext commands will be processed in the order they are
1258received by the server, like other user commands. The first argument is
1259the logged-in player. Ext commands can only be processed after a player
1260has logged in successfully.
1035 1261
1036If the callback returns something, it is sent back as if reply was being 1262If the callback returns something, it is sent back as if reply was being
1037called. 1263called.
1038 1264
1265=item cf::register_exticmd $name => \&callback($ns,$packet);
1266
1267Register a callback for execution when the client sends an (asynchronous)
1268exticmd packet. Exti commands are processed by the server as soon as they
1269are received, i.e. out of order w.r.t. other commands. The first argument
1270is a client socket. Exti commands can be received anytime, even before
1271log-in.
1272
1273If the callback returns something, it is sent back as if reply was being
1274called.
1275
1039=cut 1276=cut
1040 1277
1041sub register_extcmd { 1278sub register_extcmd {
1042 my ($name, $cb) = @_; 1279 my ($name, $cb) = @_;
1043 1280
1044 $EXTCMD{$name} = $cb; 1281 $EXTCMD{$name} = $cb;
1282}
1283
1284sub register_exticmd {
1285 my ($name, $cb) = @_;
1286
1287 $EXTICMD{$name} = $cb;
1045} 1288}
1046 1289
1047cf::player->attach ( 1290cf::player->attach (
1048 on_command => sub { 1291 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1292 my ($pl, $name, $params) = @_;
1058 cf::override; 1301 cf::override;
1059 }, 1302 },
1060 on_extcmd => sub { 1303 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1304 my ($pl, $buf) = @_;
1062 1305
1063 my $msg = eval { from_json $buf }; 1306 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1307
1065 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
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1316 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1317 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1318 }
1319
1320 $pl->ext_reply ($reply, @reply)
1321 if $reply;
1322
1071 } else { 1323 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1325 }
1074 1326
1075 cf::override; 1327 cf::override;
1102 1354
1103 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1355 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1104 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1356 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1105 1357
1106 $ext{source} = 1358 $ext{source} =
1107 "package $pkg; use strict; use utf8;\n" 1359 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1108 . "#line 1 \"$path\"\n{\n" 1360 . "#line 1 \"$path\"\n{\n"
1109 . $source 1361 . $source
1110 . "\n};\n1"; 1362 . "\n};\n1";
1111 1363
1112 $todo{$base} = \%ext; 1364 $todo{$base} = \%ext;
1128 my $msg = $@ ? "$v->{path}: $@\n" 1380 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n"; 1381 : "$v->{base}: extension inactive.\n";
1130 1382
1131 if (exists $v->{meta}{mandatory}) { 1383 if (exists $v->{meta}{mandatory}) {
1132 warn $msg; 1384 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n"; 1385 cf::cleanup "mandatory extension failed to load, exiting.";
1134 exit 1;
1135 } 1386 }
1136 1387
1137 warn $msg; 1388 warn $msg;
1138 } 1389 }
1139 1390
1153 1404
1154=back 1405=back
1155 1406
1156=head2 CORE EXTENSIONS 1407=head2 CORE EXTENSIONS
1157 1408
1158Functions and methods that extend core crossfire objects. 1409Functions and methods that extend core deliantra objects.
1159 1410
1160=cut 1411=cut
1161 1412
1162package cf::player; 1413package cf::player;
1163 1414
1164use Coro::AIO; 1415use Coro::AIO;
1165 1416
1166=head3 cf::player 1417=head3 cf::player
1167 1418
1168=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}
1169 1434
1170=item cf::player::find $login 1435=item cf::player::find $login
1171 1436
1172Returns the given player object, loading it if necessary (might block). 1437Returns the given player object, loading it if necessary (might block).
1173 1438
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1474 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1475 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1476 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1477 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1478
1214 my $pl = load_pl path $login 1479 my $f = new_from_file cf::object::thawer path $login
1215 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;
1216 $cf::PLAYER{$login} = $pl 1487 $cf::PLAYER{$login} = $pl
1217 } 1488 }
1218 } 1489 }
1219} 1490}
1220 1491
1229 return if $pl->{deny_save}; 1500 return if $pl->{deny_save};
1230 1501
1231 aio_mkdir playerdir $pl, 0770; 1502 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1503 $pl->{last_save} = $cf::RUNTIME;
1233 1504
1505 cf::get_slot 0.01;
1506
1234 $pl->save_pl ($path); 1507 $pl->save_pl ($path);
1235 Coro::cede; 1508 cf::cede_to_tick;
1236} 1509}
1237 1510
1238sub new($) { 1511sub new($) {
1239 my ($login) = @_; 1512 my ($login) = @_;
1240 1513
1246 $cf::PLAYER{$login} = $self; 1519 $cf::PLAYER{$login} = $self;
1247 1520
1248 $self 1521 $self
1249} 1522}
1250 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
1251=item $pl->quit_character 1534=item $pl->quit_character
1252 1535
1253Nukes the player without looking back. If logged in, the connection will 1536Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1537be destroyed. May block for a long time.
1255 1538
1259 my ($pl) = @_; 1542 my ($pl) = @_;
1260 1543
1261 my $name = $pl->ob->name; 1544 my $name = $pl->ob->name;
1262 1545
1263 $pl->{deny_save} = 1; 1546 $pl->{deny_save} = 1;
1264 $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
1265 1548
1266 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1549 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1267 $pl->deactivate; 1550 $pl->deactivate;
1551 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1552 $pl->ob->check_score;
1268 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1553 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1269 $pl->ns->destroy if $pl->ns; 1554 $pl->ns->destroy if $pl->ns;
1270 1555
1271 my $path = playerdir $pl; 1556 my $path = playerdir $pl;
1272 my $temp = "$path~$cf::RUNTIME~deleting~"; 1557 my $temp = "$path~$cf::RUNTIME~deleting~";
1308 or return []; 1593 or return [];
1309 1594
1310 my @logins; 1595 my @logins;
1311 1596
1312 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") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1603 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1604 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1605 $buf !~ /^password -------------$/m or next; # official not-valid tag
1606 }
1316 1607
1317 utf8::decode $login; 1608 utf8::decode $login;
1318 push @logins, $login; 1609 push @logins, $login;
1319 } 1610 }
1320 1611
1347 } 1638 }
1348 1639
1349 \@paths 1640 \@paths
1350} 1641}
1351 1642
1352=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1643=item $protocol_xml = $player->expand_cfpod ($cfpod)
1353 1644
1354Expand crossfire pod fragments into protocol xml. 1645Expand deliantra pod fragments into protocol xml.
1355 1646
1356=cut
1357
1358sub expand_cfpod {
1359 ((my $self), (local $_)) = @_;
1360
1361 # escape & and <
1362 s/&/&amp;/g;
1363 s/(?<![BIUGH])</&lt;/g;
1364
1365 # this is buggy, it needs to properly take care of nested <'s
1366
1367 1 while
1368 # replace B<>, I<>, U<> etc.
1369 s/B<([^\>]*)>/<b>$1<\/b>/
1370 || s/I<([^\>]*)>/<i>$1<\/i>/
1371 || s/U<([^\>]*)>/<u>$1<\/u>/
1372 # replace G<male|female> tags
1373 || s{G<([^>|]*)\|([^>]*)>}{
1374 $self->gender ? $2 : $1
1375 }ge
1376 # replace H<hint text>
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1378
1379 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g;
1381
1382 $_
1383}
1384
1385=item $player->ext_reply ($msgid, %msg) 1647=item $player->ext_reply ($msgid, @msg)
1386 1648
1387Sends an ext reply to the player. 1649Sends an ext reply to the player.
1388 1650
1389=cut 1651=cut
1390 1652
1391sub ext_reply($$%) { 1653sub ext_reply($$@) {
1392 my ($self, $id, %msg) = @_; 1654 my ($self, $id, @msg) = @_;
1393 1655
1394 $msg{msgid} = $id; 1656 $self->ns->ext_reply ($id, @msg)
1395
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1657}
1398 1658
1399=item $player->ext_event ($type, %msg) 1659=item $player->ext_msg ($type, @msg)
1400 1660
1401Sends an ext event to the client. 1661Sends an ext event to the client.
1402 1662
1403=cut 1663=cut
1404 1664
1405sub ext_event($$%) { 1665sub ext_msg($$@) {
1406 my ($self, $type, %msg) = @_; 1666 my ($self, $type, @msg) = @_;
1407 1667
1408 $self->ns->ext_event ($type, %msg); 1668 $self->ns->ext_msg ($type, @msg);
1409} 1669}
1410 1670
1411=head3 cf::region 1671=head3 cf::region
1412 1672
1413=over 4 1673=over 4
1426 my ($path) = @_; 1686 my ($path) = @_;
1427 1687
1428 my ($match, $specificity); 1688 my ($match, $specificity);
1429 1689
1430 for my $region (list) { 1690 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1691 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1692 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1693 if $region->specificity > $specificity;
1434 } 1694 }
1435 } 1695 }
1436 1696
1457our $MAX_RESET = 3600; 1717our $MAX_RESET = 3600;
1458our $DEFAULT_RESET = 3000; 1718our $DEFAULT_RESET = 3000;
1459 1719
1460sub generate_random_map { 1720sub generate_random_map {
1461 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
1462 # mit "rum" bekleckern, nicht 1725 # mit "rum" bekleckern, nicht
1463 $self->_create_random_map ( 1726 $self->_create_random_map (
1464 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1727 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1465 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1728 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1466 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1729 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1556 $self->init; # pass $1 etc. 1819 $self->init; # pass $1 etc.
1557 return $self; 1820 return $self;
1558 } 1821 }
1559 } 1822 }
1560 1823
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 1824 Carp::cluck "unable to resolve path '$path' (base '$base').";
1562 () 1825 ()
1563} 1826}
1564 1827
1565sub init { 1828sub init {
1566 my ($self) = @_; 1829 my ($self) = @_;
1588 1851
1589# the temporary/swap location 1852# the temporary/swap location
1590sub save_path { 1853sub save_path {
1591 my ($self) = @_; 1854 my ($self) = @_;
1592 1855
1593 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1856 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1594 "$TMPDIR/$path.map" 1857 "$TMPDIR/$path.map"
1595} 1858}
1596 1859
1597# the unique path, undef == no special unique path 1860# the unique path, undef == no special unique path
1598sub uniq_path { 1861sub uniq_path {
1599 my ($self) = @_; 1862 my ($self) = @_;
1600 1863
1601 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1602 "$UNIQUEDIR/$path" 1865 "$UNIQUEDIR/$path"
1603} 1866}
1604 1867
1605# and all this just because we cannot iterate over 1868# and all this just because we cannot iterate over
1606# all maps in C++... 1869# all maps in C++...
1629 1892
1630sub load_header_from($) { 1893sub load_header_from($) {
1631 my ($self, $path) = @_; 1894 my ($self, $path) = @_;
1632 1895
1633 utf8::encode $path; 1896 utf8::encode $path;
1634 #aio_open $path, O_RDONLY, 0 1897 my $f = new_from_file cf::object::thawer $path
1635 # or return;
1636
1637 $self->_load_header ($path)
1638 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;
1639 1905
1640 $self->{load_path} = $path; 1906 $self->{load_path} = $path;
1641 1907
1642 1 1908 1
1643} 1909}
1697sub find { 1963sub find {
1698 my ($path, $origin) = @_; 1964 my ($path, $origin) = @_;
1699 1965
1700 $path = normalise $path, $origin && $origin->path; 1966 $path = normalise $path, $origin && $origin->path;
1701 1967
1968 cf::lock_wait "map_data:$path";#d#remove
1702 cf::lock_wait "map_find:$path"; 1969 cf::lock_wait "map_find:$path";
1703 1970
1704 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1705 my $guard = cf::lock_acquire "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
1974
1706 my $map = new_from_path cf::map $path 1975 my $map = new_from_path cf::map $path
1707 or return; 1976 or return;
1708 1977
1709 $map->{last_save} = $cf::RUNTIME; 1978 $map->{last_save} = $cf::RUNTIME;
1710 1979
1712 or return; 1981 or return;
1713 1982
1714 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1983 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715 # doing this can freeze the server in a sync job, obviously 1984 # doing this can freeze the server in a sync job, obviously
1716 #$cf::WAIT_FOR_TICK->wait; 1985 #$cf::WAIT_FOR_TICK->wait;
1986 undef $guard2;
1987 undef $guard1;
1717 $map->reset; 1988 $map->reset;
1718 undef $guard;
1719 return find $path; 1989 return find $path;
1720 } 1990 }
1721 1991
1722 $cf::MAP{$path} = $map 1992 $cf::MAP{$path} = $map
1723 } 1993 }
1732 local $self->{deny_reset} = 1; # loading can take a long time 2002 local $self->{deny_reset} = 1; # loading can take a long time
1733 2003
1734 my $path = $self->{path}; 2004 my $path = $self->{path};
1735 2005
1736 { 2006 {
1737 my $guard = cf::lock_acquire "map_load:$path"; 2007 my $guard = cf::lock_acquire "map_data:$path";
1738 2008
2009 return unless $self->valid;
1739 return if $self->in_memory != cf::MAP_SWAPPED; 2010 return unless $self->in_memory == cf::MAP_SWAPPED;
1740 2011
1741 $self->in_memory (cf::MAP_LOADING); 2012 $self->in_memory (cf::MAP_LOADING);
1742 2013
1743 $self->alloc; 2014 $self->alloc;
1744 2015
1745 $self->pre_load; 2016 $self->pre_load;
1746 Coro::cede; 2017 cf::cede_to_tick;
1747 2018
2019 my $f = new_from_file cf::object::thawer $self->{load_path};
2020 $f->skip_block;
1748 $self->_load_objects ($self->{load_path}, 1) 2021 $self->_load_objects ($f)
1749 or return; 2022 or return;
1750 2023
1751 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2024 $self->post_load_original
1752 if delete $self->{load_original}; 2025 if delete $self->{load_original};
1753 2026
1754 if (my $uniq = $self->uniq_path) { 2027 if (my $uniq = $self->uniq_path) {
1755 utf8::encode $uniq; 2028 utf8::encode $uniq;
1756 if (aio_open $uniq, O_RDONLY, 0) { 2029 unless (aio_stat $uniq) {
2030 if (my $f = new_from_file cf::object::thawer $uniq) {
1757 $self->clear_unique_items; 2031 $self->clear_unique_items;
1758 $self->_load_objects ($uniq, 0); 2032 $self->_load_objects ($f);
2033 $f->resolve_delayed_derefs;
2034 }
1759 } 2035 }
1760 } 2036 }
1761 2037
1762 Coro::cede; 2038 $f->resolve_delayed_derefs;
2039
2040 cf::cede_to_tick;
1763 # now do the right thing for maps 2041 # now do the right thing for maps
1764 $self->link_multipart_objects; 2042 $self->link_multipart_objects;
1765 $self->difficulty ($self->estimate_difficulty) 2043 $self->difficulty ($self->estimate_difficulty)
1766 unless $self->difficulty; 2044 unless $self->difficulty;
1767 Coro::cede; 2045 cf::cede_to_tick;
1768 2046
1769 unless ($self->{deny_activate}) { 2047 unless ($self->{deny_activate}) {
1770 $self->decay_objects; 2048 $self->decay_objects;
1771 $self->fix_auto_apply; 2049 $self->fix_auto_apply;
1772 $self->update_buttons; 2050 $self->update_buttons;
1773 Coro::cede; 2051 cf::cede_to_tick;
1774 $self->set_darkness_map; 2052 $self->set_darkness_map;
1775 Coro::cede; 2053 cf::cede_to_tick;
1776 $self->activate; 2054 $self->activate;
1777 } 2055 }
1778 2056
2057 $self->{last_save} = $cf::RUNTIME;
2058 $self->last_access ($cf::RUNTIME);
2059
1779 $self->in_memory (cf::MAP_IN_MEMORY); 2060 $self->in_memory (cf::MAP_ACTIVE);
1780 } 2061 }
1781 2062
1782 $self->post_load; 2063 $self->post_load;
1783} 2064}
1784 2065
1793 2074
1794 $self 2075 $self
1795} 2076}
1796 2077
1797# 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
1798sub load_diag { 2079sub load_neighbours {
1799 my ($map) = @_; 2080 my ($map) = @_;
1800 2081
1801 my @diag; # diagonal neighbours 2082 my @neigh; # diagonal neighbours
1802 2083
1803 for (0 .. 3) { 2084 for (0 .. 3) {
1804 my $neigh = $map->tile_path ($_) 2085 my $neigh = $map->tile_path ($_)
1805 or next; 2086 or next;
1806 $neigh = find $neigh, $map 2087 $neigh = find $neigh, $map
1807 or next; 2088 or next;
1808 $neigh->load; 2089 $neigh->load;
1809 2090
2091 push @neigh,
1810 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2092 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1811 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2093 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1812 } 2094 }
1813 2095
1814 for (@diag) { 2096 for (grep defined $_->[0], @neigh) {
2097 my ($path, $origin) = @$_;
1815 my $neigh = find @$_ 2098 my $neigh = find $path, $origin
1816 or next; 2099 or next;
1817 $neigh->load; 2100 $neigh->load;
1818 } 2101 }
1819} 2102}
1820 2103
1825} 2108}
1826 2109
1827sub do_load_sync { 2110sub do_load_sync {
1828 my ($map) = @_; 2111 my ($map) = @_;
1829 2112
2113 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2114 if $Coro::current == $Coro::main;
2115
1830 cf::sync_job { $map->load }; 2116 cf::sync_job { $map->load };
1831} 2117}
1832 2118
1833our %MAP_PREFETCH; 2119our %MAP_PREFETCH;
1834our $MAP_PREFETCHER = undef; 2120our $MAP_PREFETCHER = undef;
1835 2121
1836sub find_async { 2122sub find_async {
1837 my ($path, $origin) = @_; 2123 my ($path, $origin, $load) = @_;
1838 2124
1839 $path = normalise $path, $origin && $origin->{path}; 2125 $path = normalise $path, $origin && $origin->{path};
1840 2126
1841 if (my $map = $cf::MAP{$path}) { 2127 if (my $map = $cf::MAP{$path}) {
1842 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2128 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1843 } 2129 }
1844 2130
1845 undef $MAP_PREFETCH{$path}; 2131 $MAP_PREFETCH{$path} |= $load;
2132
1846 $MAP_PREFETCHER ||= cf::async { 2133 $MAP_PREFETCHER ||= cf::async {
2134 $Coro::current->{desc} = "map prefetcher";
2135
1847 while (%MAP_PREFETCH) { 2136 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 2137 while (my ($k, $v) = each %MAP_PREFETCH) {
1849 my $map = find $path 2138 if (my $map = find $k) {
1850 or next;
1851 $map->load; 2139 $map->load if $v;
2140 }
1852 2141
1853 delete $MAP_PREFETCH{$path}; 2142 delete $MAP_PREFETCH{$k};
1854 } 2143 }
1855 } 2144 }
1856 undef $MAP_PREFETCHER; 2145 undef $MAP_PREFETCHER;
1857 }; 2146 };
1858 $MAP_PREFETCHER->prio (6); 2147 $MAP_PREFETCHER->prio (6);
1861} 2150}
1862 2151
1863sub save { 2152sub save {
1864 my ($self) = @_; 2153 my ($self) = @_;
1865 2154
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2155 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2156
1868 $self->{last_save} = $cf::RUNTIME; 2157 $self->{last_save} = $cf::RUNTIME;
1869 2158
1870 return unless $self->dirty; 2159 return unless $self->dirty;
1871 2160
1877 return if $self->{deny_save}; 2166 return if $self->{deny_save};
1878 2167
1879 local $self->{last_access} = $self->last_access;#d# 2168 local $self->{last_access} = $self->last_access;#d#
1880 2169
1881 cf::async { 2170 cf::async {
2171 $Coro::current->{desc} = "map player save";
1882 $_->contr->save for $self->players; 2172 $_->contr->save for $self->players;
1883 }; 2173 };
2174
2175 cf::get_slot 0.02;
1884 2176
1885 if ($uniq) { 2177 if ($uniq) {
1886 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2178 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1887 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2179 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1888 } else { 2180 } else {
1894 my ($self) = @_; 2186 my ($self) = @_;
1895 2187
1896 # save first because save cedes 2188 # save first because save cedes
1897 $self->save; 2189 $self->save;
1898 2190
1899 my $lock = cf::lock_acquire "map_data:" . $self->path; 2191 my $lock = cf::lock_acquire "map_data:$self->{path}";
1900 2192
1901 return if $self->players; 2193 return if $self->players;
1902 return if $self->in_memory != cf::MAP_IN_MEMORY; 2194 return if $self->in_memory != cf::MAP_ACTIVE;
1903 return if $self->{deny_save}; 2195 return if $self->{deny_save};
1904 2196
2197 $self->in_memory (cf::MAP_SWAPPED);
2198
2199 $self->deactivate;
2200 $_->clear_links_to ($self) for values %cf::MAP;
1905 $self->clear; 2201 $self->clear;
1906 $self->in_memory (cf::MAP_SWAPPED);
1907} 2202}
1908 2203
1909sub reset_at { 2204sub reset_at {
1910 my ($self) = @_; 2205 my ($self) = @_;
1911 2206
1943 if $uniq; 2238 if $uniq;
1944 } 2239 }
1945 2240
1946 delete $cf::MAP{$self->path}; 2241 delete $cf::MAP{$self->path};
1947 2242
2243 $self->deactivate;
2244 $_->clear_links_to ($self) for values %cf::MAP;
1948 $self->clear; 2245 $self->clear;
1949
1950 $_->clear_links_to ($self) for values %cf::MAP;
1951 2246
1952 $self->unlink_save; 2247 $self->unlink_save;
1953 $self->destroy; 2248 $self->destroy;
1954} 2249}
1955 2250
1956my $nuke_counter = "aaaa"; 2251my $nuke_counter = "aaaa";
1957 2252
1958sub nuke { 2253sub nuke {
1959 my ($self) = @_; 2254 my ($self) = @_;
1960 2255
2256 {
2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2258
1961 delete $cf::MAP{$self->path}; 2259 delete $cf::MAP{$self->path};
1962 2260
1963 $self->unlink_save; 2261 $self->unlink_save;
1964 2262
1965 bless $self, "cf::map"; 2263 bless $self, "cf::map";
1966 delete $self->{deny_reset}; 2264 delete $self->{deny_reset};
1967 $self->{deny_save} = 1; 2265 $self->{deny_save} = 1;
1968 $self->reset_timeout (1); 2266 $self->reset_timeout (1);
1969 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2267 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970 2268
1971 $cf::MAP{$self->path} = $self; 2269 $cf::MAP{$self->path} = $self;
2270 }
1972 2271
1973 $self->reset; # polite request, might not happen 2272 $self->reset; # polite request, might not happen
1974} 2273}
1975 2274
1976=item $maps = cf::map::tmp_maps 2275=item $maps = cf::map::tmp_maps
2018 2317
2019sub unique_maps() { 2318sub unique_maps() {
2020 [ 2319 [
2021 map { 2320 map {
2022 utf8::decode $_; 2321 utf8::decode $_;
2023 /\.map$/ 2322 s/\.map$//; # TODO future compatibility hack
2323 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2324 ? ()
2024 ? normalise $_ 2325 : normalise $_
2025 : ()
2026 } @{ aio_readdir $UNIQUEDIR or [] } 2326 } @{ aio_readdir $UNIQUEDIR or [] }
2027 ] 2327 ]
2028} 2328}
2029 2329
2030package cf;
2031
2032=back 2330=back
2033 2331
2034=head3 cf::object 2332=head3 cf::object
2035 2333
2036=cut 2334=cut
2039 2337
2040=over 4 2338=over 4
2041 2339
2042=item $ob->inv_recursive 2340=item $ob->inv_recursive
2043 2341
2044Returns 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.
2045 2344
2046=cut 2345=cut
2047 2346
2048sub inv_recursive_; 2347sub inv_recursive_;
2049sub inv_recursive_ { 2348sub inv_recursive_ {
2052 2351
2053sub inv_recursive { 2352sub inv_recursive {
2054 inv_recursive_ inv $_[0] 2353 inv_recursive_ inv $_[0]
2055} 2354}
2056 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
2057package cf; 2384package cf;
2058 2385
2059=back 2386=back
2060 2387
2061=head3 cf::object::player 2388=head3 cf::object::player
2067Sends 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>
2068can 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
2069dialogue with the given NPC character. 2396dialogue with the given NPC character.
2070 2397
2071=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};
2072 2413
2073# rough implementation of a future "reply" method that works 2414# rough implementation of a future "reply" method that works
2074# with dialog boxes. 2415# with dialog boxes.
2075#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
2076sub cf::object::player::reply($$$;$) { 2417sub cf::object::player::reply($$$;$) {
2083 2424
2084 } else { 2425 } else {
2085 my $pl = $self->contr; 2426 my $pl = $self->contr;
2086 2427
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2428 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog}; 2429 my $dialog = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply ( 2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090 $diag->{id},
2091 msgtype => "reply",
2092 msg => $diag->{pl}->expand_cfpod ($msg),
2093 add_topics => []
2094 );
2095 2431
2096 } else { 2432 } else {
2097 $msg = $npc->name . " says: $msg" if $npc; 2433 $msg = $npc->name . " says: $msg" if $npc;
2098 $self->message ($msg, $flags); 2434 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2099 } 2435 }
2100 } 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 (@_);
2101} 2447}
2102 2448
2103=item $player_object->may ("access") 2449=item $player_object->may ("access")
2104 2450
2105Returns wether the given player is authorized to access resource "access" 2451Returns wether the given player is authorized to access resource "access"
2118 2464
2119=item $player_object->enter_link 2465=item $player_object->enter_link
2120 2466
2121Freezes 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}>).
2122 2468
2123The 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.
2124I<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.
2125 2473
2126Will never block. 2474Will never block.
2127 2475
2128=item $player_object->leave_link ($map, $x, $y) 2476=item $player_object->leave_link ($map, $x, $y)
2129 2477
2184 # use -1 or undef as default coordinates, not 0, 0 2532 # use -1 or undef as default coordinates, not 0, 0
2185 ($x, $y) = ($map->enter_x, $map->enter_y) 2533 ($x, $y) = ($map->enter_x, $map->enter_y)
2186 if $x <=0 && $y <= 0; 2534 if $x <=0 && $y <= 0;
2187 2535
2188 $map->load; 2536 $map->load;
2189 $map->load_diag; 2537 $map->load_neighbours;
2190 2538
2191 return unless $self->contr->active; 2539 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2192 $self->activate_recursive; 2541 $self->activate_recursive;
2193 2542
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2544 $self->enter_map ($map, $x, $y);
2196} 2545}
2197 2546
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199 2548
2200Moves the player to the given map-path and coordinates by first freezing 2549Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback 2550her, loading and preparing them map, calling the provided $check callback
2202that 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
2203the new (success) or old (failed) map position. 2552the new (success) or old (failed) map position. In either case, $done will
2553be called at the end of this process.
2554
2555Note that $check will be called with a potentially non-loaded map, so if
2556it needs a loaded map it has to call C<< ->load >>.
2204 2557
2205=cut 2558=cut
2206 2559
2207our $GOTOGEN; 2560our $GOTOGEN;
2208 2561
2209sub cf::object::player::goto { 2562sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2563 my ($self, $path, $x, $y, $check, $done) = @_;
2211 2564
2212 # do generation counting so two concurrent goto's will be executed in-order 2565 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2566 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2567
2215 $self->enter_link; 2568 $self->enter_link;
2216 2569
2217 (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
2218 my $map = eval { 2592 my $map = eval {
2219 my $map = cf::map::find $path; 2593 my $map = defined $path ? cf::map::find $path : undef;
2220 2594
2221 if ($map) { 2595 if ($map) {
2222 $map = $map->customise_for ($self); 2596 $map = $map->customise_for ($self);
2223 $map = $check->($map) if $check && $map; 2597 $map = $check->($map) if $check && $map;
2224 } else { 2598 } else {
2225 $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);
2226 } 2600 }
2227 2601
2228 $map 2602 $map
2229 }; 2603 };
2230 2604
2235 2609
2236 if ($gen == $self->{_goto_generation}) { 2610 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2611 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2612 $self->leave_link ($map, $x, $y);
2239 } 2613 }
2614
2615 $done->() if $done;
2240 })->prio (1); 2616 })->prio (1);
2241} 2617}
2242 2618
2243=item $player_object->enter_exit ($exit_object) 2619=item $player_object->enter_exit ($exit_object)
2244 2620
2264} 2640}
2265 2641
2266sub prepare_random_map { 2642sub prepare_random_map {
2267 my ($exit) = @_; 2643 my ($exit) = @_;
2268 2644
2269 my $guard = cf::lock_acquire "exit_prepare:$exit";
2270
2271 # all this does is basically replace the /! path by 2645 # all this does is basically replace the /! path by
2272 # a new random map path (?random/...) with a seed 2646 # a new random map path (?random/...) with a seed
2273 # that depends on the exit object 2647 # that depends on the exit object
2274 2648
2275 my $rmp = parse_random_map_params $exit->msg; 2649 my $rmp = parse_random_map_params $exit->msg;
2277 if ($exit->map) { 2651 if ($exit->map) {
2278 $rmp->{region} = $exit->region->name; 2652 $rmp->{region} = $exit->region->name;
2279 $rmp->{origin_map} = $exit->map->path; 2653 $rmp->{origin_map} = $exit->map->path;
2280 $rmp->{origin_x} = $exit->x; 2654 $rmp->{origin_x} = $exit->x;
2281 $rmp->{origin_y} = $exit->y; 2655 $rmp->{origin_y} = $exit->y;
2656
2657 $exit->map->touch;
2282 } 2658 }
2283 2659
2284 $rmp->{random_seed} ||= $exit->random_seed; 2660 $rmp->{random_seed} ||= $exit->random_seed;
2285 2661
2286 my $data = cf::to_json $rmp; 2662 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2287 my $md5 = Digest::MD5::md5_hex $data; 2663 my $md5 = Digest::MD5::md5_hex $data;
2288 my $meta = "$RANDOMDIR/$md5.meta"; 2664 my $meta = "$RANDOMDIR/$md5.meta";
2289 2665
2290 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2666 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2291 aio_write $fh, 0, (length $data), $data, 0; 2667 aio_write $fh, 0, (length $data), $data, 0;
2292 undef $fh; 2668 undef $fh;
2293 aio_rename "$meta~", $meta; 2669 aio_rename "$meta~", $meta;
2294 2670
2671 my $slaying = "?random/$md5";
2672
2673 if ($exit->valid) {
2295 $exit->slaying ("?random/$md5"); 2674 $exit->slaying ("?random/$md5");
2296 $exit->msg (undef); 2675 $exit->msg (undef);
2676 }
2297 } 2677 }
2298} 2678}
2299 2679
2300sub cf::object::player::enter_exit { 2680sub cf::object::player::enter_exit {
2301 my ($self, $exit) = @_; 2681 my ($self, $exit) = @_;
2302 2682
2303 return unless $self->type == cf::PLAYER; 2683 return unless $self->type == cf::PLAYER;
2304 2684
2305 if ($exit->slaying eq "/!") {
2306 #TODO: this should de-fi-ni-te-ly not be a sync-job
2307 # the problem is that $exit might not survive long enough
2308 # so it needs to be done right now, right here
2309 cf::sync_job { prepare_random_map $exit };
2310 }
2311
2312 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2313 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp;
2315
2316 $self->enter_link; 2685 $self->enter_link;
2317 2686
2318 (async { 2687 (async {
2319 $self->deactivate_recursive; # just to be sure 2688 $Coro::current->{desc} = "enter_exit";
2689
2320 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
2321 $self->goto ($slaying, $hp, $sp); 2705 $self->goto ($map, $x, $y);
2322 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
2323 1; 2711 1
2324 }) { 2712 }) {
2325 $self->message ("Something went wrong deep within the crossfire server. " 2713 $self->message ("Something went wrong deep within the deliantra server. "
2326 . "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. "
2327 . "Please report this to the dungeon master!", 2715 . "Please report this to the dungeon master!",
2328 cf::NDI_UNIQUE | cf::NDI_RED); 2716 cf::NDI_UNIQUE | cf::NDI_RED);
2329 2717
2330 warn "ERROR in enter_exit: $@"; 2718 warn "ERROR in enter_exit: $@";
2349 2737
2350 utf8::encode $text; 2738 utf8::encode $text;
2351 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352} 2740}
2353 2741
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 2742=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 2743
2356Send a drawinfo or msg packet to the client, formatting the msg for the 2744Send a drawinfo or msg packet to the client, formatting the msg for the
2357client if neccessary. C<$type> should be a string identifying the type of 2745client if neccessary. C<$type> should be a string identifying the type of
2358the 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
2359the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2360 2748
2361=cut 2749=cut
2362 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
2363sub cf::client::send_msg { 2809sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2810 my ($self, $channel, $msg, $color, @extra) = @_;
2365 2811
2366 $msg = $self->pl->expand_cfpod ($msg); 2812 $msg = $self->pl->expand_cfpod ($msg)
2813 unless $color & cf::NDI_VERBATIM;
2814
2815 $color &= cf::NDI_CLIENT_MASK; # just in case...
2816
2817 # check predefined channels, for the benefit of C
2818 if ($CHANNEL{$channel}) {
2819 $channel = $CHANNEL{$channel};
2820
2821 $self->ext_msg (channel_info => $channel)
2822 if $self->can_msg;
2823
2824 $channel = $channel->{id};
2825
2826 } elsif (ref $channel) {
2827 # send meta info to client, if not yet sent
2828 unless (exists $self->{channel}{$channel->{id}}) {
2829 $self->{channel}{$channel->{id}} = $channel;
2830 $self->ext_msg (channel_info => $channel)
2831 if $self->can_msg;
2832 }
2833
2834 $channel = $channel->{id};
2835 }
2836
2837 return unless @extra || length $msg;
2367 2838
2368 if ($self->can_msg) { 2839 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2840 # default colour, mask it out
2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2842 if $color & cf::NDI_DEF;
2843
2844 my $pkt = "msg "
2845 . $self->{json_coder}->encode (
2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 );
2848
2849 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf};
2852
2853 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag";
2857 }
2858
2859 $self->send_packet ($pkt);
2370 } else { 2860 } else {
2371 # replace some tags by gcfclient-compatible ones
2372 for ($msg) {
2373 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2379 }
2380
2381 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
2382 if (0 && $msg =~ /\[/) { 2876 if (0 && $msg =~ /\[/) {
2877 # COMMAND/INFO
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2878 $self->send_packet ("drawextinfo $color 10 8 $msg")
2384 } else { 2879 } else {
2385 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2880 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2386 $self->send_packet ("drawinfo $color $msg") 2881 $self->send_packet ("drawinfo $color $msg")
2387 } 2882 }
2388 } 2883 }
2389 } 2884 }
2390} 2885}
2391 2886
2392=item $client->ext_event ($type, %msg) 2887=item $client->ext_msg ($type, @msg)
2393 2888
2394Sends an exti event to the client. 2889Sends an ext event to the client.
2395 2890
2396=cut 2891=cut
2397 2892
2398sub cf::client::ext_event($$%) { 2893sub cf::client::ext_msg($$@) {
2399 my ($self, $type, %msg) = @_; 2894 my ($self, $type, @msg) = @_;
2400 2895
2896 if ($self->extcmd == 2) {
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2898 } elsif ($self->extcmd == 1) { # TODO: remove
2401 $msg{msgtype} = "event_$type"; 2899 push @msg, msgtype => "event_$type";
2402 $self->send_packet ("ext " . cf::to_json \%msg); 2900 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2901 }
2902}
2903
2904=item $client->ext_reply ($msgid, @msg)
2905
2906Sends an ext reply to the client.
2907
2908=cut
2909
2910sub cf::client::ext_reply($$@) {
2911 my ($self, $id, @msg) = @_;
2912
2913 if ($self->extcmd == 2) {
2914 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2915 } elsif ($self->extcmd == 1) {
2916 #TODO: version 1, remove
2917 unshift @msg, msgtype => "reply", msgid => $id;
2918 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2919 }
2403} 2920}
2404 2921
2405=item $success = $client->query ($flags, "text", \&cb) 2922=item $success = $client->query ($flags, "text", \&cb)
2406 2923
2407Queues a query to the client, calling the given callback with 2924Queues a query to the client, calling the given callback with
2408the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2925the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2409C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2926C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2410 2927
2411Queries can fail, so check the return code. Or don't, as queries will become 2928Queries can fail, so check the return code. Or don't, as queries will
2412reliable at some point in the future. 2929become reliable at some point in the future.
2413 2930
2414=cut 2931=cut
2415 2932
2416sub cf::client::query { 2933sub cf::client::query {
2417 my ($self, $flags, $text, $cb) = @_; 2934 my ($self, $flags, $text, $cb) = @_;
2425 utf8::encode $text; 2942 utf8::encode $text;
2426 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2943 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427 2944
2428 $self->send_packet ($self->{query_queue}[0][0]) 2945 $self->send_packet ($self->{query_queue}[0][0])
2429 if @{ $self->{query_queue} } == 1; 2946 if @{ $self->{query_queue} } == 1;
2947
2948 1
2430} 2949}
2431 2950
2432cf::client->attach ( 2951cf::client->attach (
2952 on_connect => sub {
2953 my ($ns) = @_;
2954
2955 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2956 },
2433 on_reply => sub { 2957 on_reply => sub {
2434 my ($ns, $msg) = @_; 2958 my ($ns, $msg) = @_;
2435 2959
2436 # this weird shuffling is so that direct followup queries 2960 # this weird shuffling is so that direct followup queries
2437 # get handled first 2961 # get handled first
2449 } else { 2973 } else {
2450 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2974 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451 } 2975 }
2452 } 2976 }
2453 }, 2977 },
2978 on_exticmd => sub {
2979 my ($ns, $buf) = @_;
2980
2981 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2982
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
2991 if (my $cb = $EXTICMD{$type}) {
2992 @reply = $cb->($ns, @payload);
2993 }
2994
2995 $ns->ext_reply ($reply, @reply)
2996 if $reply;
2997
2998 } else {
2999 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3000 }
3001
3002 cf::override;
3003 },
2454); 3004);
2455 3005
2456=item $client->async (\&cb) 3006=item $client->async (\&cb)
2457 3007
2458Create a new coroutine, running the specified callback. The coroutine will 3008Create a new coroutine, running the specified callback. The coroutine will
2499our $safe = new Safe "safe"; 3049our $safe = new Safe "safe";
2500our $safe_hole = new Safe::Hole; 3050our $safe_hole = new Safe::Hole;
2501 3051
2502$SIG{FPE} = 'IGNORE'; 3052$SIG{FPE} = 'IGNORE';
2503 3053
2504$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));
2505 3059
2506# here we export the classes and methods available to script code 3060# here we export the classes and methods available to script code
2507 3061
2508=pod 3062=pod
2509 3063
2510The following functions and methods are available within a safe environment: 3064The following functions and methods are available within a safe environment:
2511 3065
2512 cf::object contr pay_amount pay_player map 3066 cf::object
3067 contr pay_amount pay_player map x y force_find force_add destroy
3068 insert remove name archname title slaying race decrease split
3069
2513 cf::object::player player 3070 cf::object::player
2514 cf::player peaceful 3071 player
2515 cf::map trigger 3072
3073 cf::player
3074 peaceful
3075
3076 cf::map
3077 trigger
2516 3078
2517=cut 3079=cut
2518 3080
2519for ( 3081for (
2520 ["cf::object" => qw(contr pay_amount pay_player map)], 3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3083 insert remove inv nrof name archname title slaying race
3084 decrease split destroy change_exp)],
2521 ["cf::object::player" => qw(player)], 3085 ["cf::object::player" => qw(player)],
2522 ["cf::player" => qw(peaceful)], 3086 ["cf::player" => qw(peaceful)],
2523 ["cf::map" => qw(trigger)], 3087 ["cf::map" => qw(trigger)],
2524) { 3088) {
2525 no strict 'refs'; 3089 no strict 'refs';
2601# the server's init and main functions 3165# the server's init and main functions
2602 3166
2603sub load_facedata($) { 3167sub load_facedata($) {
2604 my ($path) = @_; 3168 my ($path) = @_;
2605 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
2606 warn "loading facedata from $path\n"; 3176 warn "loading facedata from $path\n";
2607 3177
2608 my $facedata; 3178 my $facedata;
2609 0 < aio_load $path, $facedata 3179 0 < aio_load $path, $facedata
2610 or die "$path: $!"; 3180 or die "$path: $!";
2612 $facedata = Coro::Storable::thaw $facedata; 3182 $facedata = Coro::Storable::thaw $facedata;
2613 3183
2614 $facedata->{version} == 2 3184 $facedata->{version} == 2
2615 or cf::cleanup "$path: version mismatch, cannot proceed."; 3185 or cf::cleanup "$path: version mismatch, cannot proceed.";
2616 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
2617 { 3194 {
2618 my $faces = $facedata->{faceinfo}; 3195 my $faces = $facedata->{faceinfo};
2619 3196
2620 while (my ($face, $info) = each %$faces) { 3197 while (my ($face, $info) = each %$faces) {
2621 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3198 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3199
2622 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3200 cf::face::set_visibility $idx, $info->{visibility};
3201 cf::face::set_magicmap $idx, $info->{magicmap};
2623 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3202 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2624 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3203 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2625 Coro::cede; 3204
3205 cf::cede_to_tick;
2626 } 3206 }
2627 3207
2628 while (my ($face, $info) = each %$faces) { 3208 while (my ($face, $info) = each %$faces) {
2629 next unless $info->{smooth}; 3209 next unless $info->{smooth};
3210
2630 my $idx = cf::face::find $face 3211 my $idx = cf::face::find $face
2631 or next; 3212 or next;
3213
2632 if (my $smooth = cf::face::find $info->{smooth}) { 3214 if (my $smooth = cf::face::find $info->{smooth}) {
3215 cf::face::set_smooth $idx, $smooth;
2633 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3216 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634 } else { 3217 } else {
2635 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3218 warn "smooth face '$info->{smooth}' not found for face '$face'";
2636 } 3219 }
2637 Coro::cede; 3220
3221 cf::cede_to_tick;
2638 } 3222 }
2639 } 3223 }
2640 3224
2641 { 3225 {
2642 my $anims = $facedata->{animinfo}; 3226 my $anims = $facedata->{animinfo};
2643 3227
2644 while (my ($anim, $info) = each %$anims) { 3228 while (my ($anim, $info) = each %$anims) {
2645 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3229 cf::anim::set $anim, $info->{frames}, $info->{facings};
2646 Coro::cede; 3230 cf::cede_to_tick;
2647 } 3231 }
2648 3232
2649 cf::anim::invalidate_all; # d'oh 3233 cf::anim::invalidate_all; # d'oh
2650 } 3234 }
2651 3235
3236 {
3237 # TODO: for gcfclient pleasure, we should give resources
3238 # that gcfclient doesn't grok a >10000 face index.
3239 my $res = $facedata->{resource};
3240
3241 while (my ($name, $info) = each %$res) {
3242 if (defined $info->{type}) {
3243 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3244 my $data;
3245
3246 if ($info->{type} & 1) {
3247 # prepend meta info
3248
3249 my $meta = $enc->encode ({
3250 name => $name,
3251 %{ $info->{meta} || {} },
3252 });
3253
3254 $data = pack "(w/a*)*", $meta, $info->{data};
3255 } else {
3256 $data = $info->{data};
3257 }
3258
3259 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3260 cf::face::set_type $idx, $info->{type};
3261 } else {
3262 $RESOURCE{$name} = $info;
3263 }
3264
3265 cf::cede_to_tick;
3266 }
3267 }
3268
3269 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3270
2652 1 3271 1
2653} 3272}
2654 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
2655sub 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
2656 load_resource_file "$MAPDIR/regions" 3317 load_resource_file "$MAPDIR/regions"
2657 or die "unable to load regions file\n"; 3318 or die "unable to load regions file\n";
3319
3320 for (cf::region::list) {
3321 $_->{match} = qr/$_->{match}/
3322 if exists $_->{match};
3323 }
2658} 3324}
2659 3325
2660sub reload_facedata { 3326sub reload_facedata {
2661 load_facedata "$DATADIR/facedata" 3327 load_facedata "$DATADIR/facedata"
2662 or die "unable to load facedata\n"; 3328 or die "unable to load facedata\n";
2673} 3339}
2674 3340
2675sub reload_resources { 3341sub reload_resources {
2676 warn "reloading resource files...\n"; 3342 warn "reloading resource files...\n";
2677 3343
3344 reload_facedata;
3345 reload_archetypes;
2678 reload_regions; 3346 reload_regions;
2679 reload_facedata;
2680 #reload_archetypes;#d#
2681 reload_archetypes;
2682 reload_treasures; 3347 reload_treasures;
2683 3348
2684 warn "finished reloading resource files\n"; 3349 warn "finished reloading resource files\n";
2685} 3350}
2686 3351
2687sub init { 3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
2688 reload_resources; 3357 reload_resources;
2689} 3358}
2690 3359
2691sub cfg_load { 3360sub reload_config {
2692 open my $fh, "<:utf8", "$CONFDIR/config" 3361 open my $fh, "<:utf8", "$CONFDIR/config"
2693 or return; 3362 or return;
2694 3363
2695 local $/; 3364 local $/;
2696 *CFG = YAML::Syck::Load <$fh>; 3365 *CFG = YAML::Load <$fh>;
2697 3366
2698 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3367 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2699 3368
2700 $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};
2701 $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};
2707 }; 3376 };
2708 warn $@ if $@; 3377 warn $@ if $@;
2709 } 3378 }
2710} 3379}
2711 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
2712sub main { 3400sub main {
3401 atomic;
3402
2713 # we must not ever block the main coroutine 3403 # we must not ever block the main coroutine
2714 local $Coro::idle = sub { 3404 local $Coro::idle = sub {
2715 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#
2716 (async { 3406 (async {
2717 Event::one_event; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT;
2718 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
2719 }; 3410 };
2720 3411
2721 cfg_load; 3412 {
3413 my $guard = freeze_mainloop;
3414 reload_config;
2722 db_init; 3415 db_init;
2723 load_extensions; 3416 load_extensions;
2724 3417
2725 $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
2726 Event::loop; 3426 EV::loop;
2727} 3427}
2728 3428
2729############################################################################# 3429#############################################################################
2730# initialisation and cleanup 3430# initialisation and cleanup
2731 3431
2732# install some emergency cleanup handlers 3432# install some emergency cleanup handlers
2733BEGIN { 3433BEGIN {
3434 our %SIGWATCHER = ();
2734 for my $signal (qw(INT HUP TERM)) { 3435 for my $signal (qw(INT HUP TERM)) {
2735 Event->signal ( 3436 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2736 reentrant => 0,
2737 data => WF_AUTOCANCEL,
2738 signal => $signal,
2739 prio => 0,
2740 cb => sub {
2741 cf::cleanup "SIG$signal"; 3437 cf::cleanup "SIG$signal";
2742 },
2743 ); 3438 };
2744 } 3439 }
2745} 3440}
2746 3441
2747sub write_runtime { 3442sub write_runtime_sync {
2748 my $runtime = "$LOCALDIR/runtime";
2749
2750 # first touch the runtime file to show we are still running: 3443 # first touch the runtime file to show we are still running:
2751 # the fsync below can take a very very long time. 3444 # the fsync below can take a very very long time.
2752 3445
2753 IO::AIO::aio_utime $runtime, undef, undef; 3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2754 3447
2755 my $guard = cf::lock_acquire "write_runtime"; 3448 my $guard = cf::lock_acquire "write_runtime";
2756 3449
2757 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2758 or return; 3451 or return;
2759 3452
2760 my $value = $cf::RUNTIME + 90 + 10; 3453 my $value = $cf::RUNTIME + 90 + 10;
2761 # 10 is the runtime save interval, for a monotonic clock 3454 # 10 is the runtime save interval, for a monotonic clock
2762 # 60 allows for the watchdog to kill the server. 3455 # 60 allows for the watchdog to kill the server.
2772 aio_utime $fh, undef, undef; 3465 aio_utime $fh, undef, undef;
2773 3466
2774 close $fh 3467 close $fh
2775 or return; 3468 or return;
2776 3469
2777 aio_rename "$runtime~", $runtime 3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2778 and return; 3471 and return;
2779 3472
2780 warn "runtime file written.\n"; 3473 warn "runtime file written.\n";
2781 3474
2782 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 };
2783} 3519}
2784 3520
2785sub emergency_save() { 3521sub emergency_save() {
2786 my $freeze_guard = cf::freeze_mainloop; 3522 my $freeze_guard = cf::freeze_mainloop;
2787 3523
2793 # and maps saved/destroyed asynchronously. 3529 # and maps saved/destroyed asynchronously.
2794 warn "begin emergency player save\n"; 3530 warn "begin emergency player save\n";
2795 for my $login (keys %cf::PLAYER) { 3531 for my $login (keys %cf::PLAYER) {
2796 my $pl = $cf::PLAYER{$login} or next; 3532 my $pl = $cf::PLAYER{$login} or next;
2797 $pl->valid or next; 3533 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2798 $pl->save; 3535 $pl->save;
2799 } 3536 }
2800 warn "end emergency player save\n"; 3537 warn "end emergency player save\n";
2801 3538
2802 warn "begin emergency map save\n"; 3539 warn "begin emergency map save\n";
2808 warn "end emergency map save\n"; 3545 warn "end emergency map save\n";
2809 3546
2810 warn "begin emergency database checkpoint\n"; 3547 warn "begin emergency database checkpoint\n";
2811 BDB::db_env_txn_checkpoint $DB_ENV; 3548 BDB::db_env_txn_checkpoint $DB_ENV;
2812 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";
2813 }; 3554 };
2814 3555
2815 warn "leave emergency perl save\n"; 3556 warn "leave emergency perl save\n";
2816} 3557}
2817 3558
2818sub post_cleanup { 3559sub post_cleanup {
2819 my ($make_core) = @_; 3560 my ($make_core) = @_;
2820 3561
2821 warn Carp::longmess "post_cleanup backtrace" 3562 warn Carp::longmess "post_cleanup backtrace"
2822 if $make_core; 3563 if $make_core;
3564
3565 my $fh = pidfile;
3566 unlink $PIDFILE if <$fh> == $$;
2823} 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
2824 3596
2825sub do_reload_perl() { 3597sub do_reload_perl() {
2826 # can/must only be called in main 3598 # can/must only be called in main
2827 if ($Coro::current != $Coro::main) { 3599 if ($Coro::current != $Coro::main) {
2828 warn "can only reload from main coroutine"; 3600 warn "can only reload from main coroutine";
2829 return; 3601 return;
2830 } 3602 }
2831 3603
3604 return if $RELOAD++;
3605
3606 while ($RELOAD) {
2832 warn "reloading..."; 3607 warn "reloading...";
2833 3608
2834 warn "entering sync_job"; 3609 warn "entering sync_job";
2835 3610
2836 cf::sync_job { 3611 cf::sync_job {
2837 cf::write_runtime; # external watchdog should not bark 3612 cf::write_runtime_sync; # external watchdog should not bark
2838 cf::emergency_save; 3613 cf::emergency_save;
2839 cf::write_runtime; # external watchdog should not bark 3614 cf::write_runtime_sync; # external watchdog should not bark
2840 3615
2841 warn "syncing database to disk"; 3616 warn "syncing database to disk";
2842 BDB::db_env_txn_checkpoint $DB_ENV; 3617 BDB::db_env_txn_checkpoint $DB_ENV;
2843 3618
2844 # 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
2845 3620
2846 warn "cancelling all WF_AUTOCANCEL watchers";
2847 for (Event::all_watchers) {
2848 $_->cancel if $_->data & WF_AUTOCANCEL;
2849 }
2850
2851 warn "flushing outstanding aio requests"; 3621 warn "flushing outstanding aio requests";
2852 for (;;) {
2853 BDB::flush;
2854 IO::AIO::flush;
2855 Coro::cede;
2856 last unless IO::AIO::nreqs || BDB::nreqs; 3622 while (IO::AIO::nreqs || BDB::nreqs) {
2857 warn "iterate..."; 3623 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2858 }
2859
2860 ++$RELOAD;
2861
2862 warn "cancelling all extension coros";
2863 $_->cancel for values %EXT_CORO;
2864 %EXT_CORO = ();
2865
2866 warn "removing commands";
2867 %COMMAND = ();
2868
2869 warn "removing ext commands";
2870 %EXTCMD = ();
2871
2872 warn "unloading/nuking all extensions";
2873 for my $pkg (@EXTS) {
2874 warn "... unloading $pkg";
2875
2876 if (my $cb = $pkg->can ("unload")) {
2877 eval {
2878 $cb->($pkg);
2879 1
2880 } or warn "$pkg unloaded, but with errors: $@";
2881 } 3624 }
2882 3625
2883 warn "... nuking $pkg"; 3626 warn "cancelling all extension coros";
2884 Symbol::delete_package $pkg; 3627 $_->cancel for values %EXT_CORO;
2885 } 3628 %EXT_CORO = ();
2886 3629
2887 warn "unloading all perl modules loaded from $LIBDIR"; 3630 warn "removing commands";
2888 while (my ($k, $v) = each %INC) { 3631 %COMMAND = ();
2889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2890 3632
3633 warn "removing ext/exti commands";
3634 %EXTCMD = ();
3635 %EXTICMD = ();
3636
3637 warn "unloading/nuking all extensions";
3638 for my $pkg (@EXTS) {
2891 warn "... unloading $k"; 3639 warn "... unloading $pkg";
2892 delete $INC{$k};
2893 3640
2894 $k =~ s/\.pm$//;
2895 $k =~ s/\//::/g;
2896
2897 if (my $cb = $k->can ("unload_module")) { 3641 if (my $cb = $pkg->can ("unload")) {
3642 eval {
2898 $cb->(); 3643 $cb->($pkg);
3644 1
3645 } or warn "$pkg unloaded, but with errors: $@";
3646 }
3647
3648 warn "... clearing $pkg";
3649 clear_package $pkg;
2899 } 3650 }
2900 3651
2901 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;
2902 } 3667 }
2903 3668
2904 warn "getting rid of safe::, as good as possible"; 3669 warn "getting rid of safe::, as good as possible";
2905 Symbol::delete_package "safe::$_" 3670 clear_package "safe::$_"
2906 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);
2907 3672
2908 warn "unloading cf.pm \"a bit\""; 3673 warn "unloading cf.pm \"a bit\"";
2909 delete $INC{"cf.pm"}; 3674 delete $INC{"cf.pm"};
2910 delete $INC{"cf/pod.pm"}; 3675 delete $INC{"cf/pod.pm"};
2911 3676
2912 # don't, removes xs symbols, too, 3677 # don't, removes xs symbols, too,
2913 # and global variables created in xs 3678 # and global variables created in xs
2914 #Symbol::delete_package __PACKAGE__; 3679 #clear_package __PACKAGE__;
2915 3680
2916 warn "unload completed, starting to reload now"; 3681 warn "unload completed, starting to reload now";
2917 3682
2918 warn "reloading cf.pm"; 3683 warn "reloading cf.pm";
2919 require cf; 3684 require cf;
2920 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2921 3686
2922 warn "loading config and database again"; 3687 warn "loading config and database again";
2923 cf::cfg_load; 3688 cf::reload_config;
2924 3689
2925 warn "loading extensions"; 3690 warn "loading extensions";
2926 cf::load_extensions; 3691 cf::load_extensions;
2927 3692
2928 warn "reattaching attachments to objects/players"; 3693 warn "reattaching attachments to objects/players";
2929 _global_reattach; # objects, sockets 3694 _global_reattach; # objects, sockets
2930 warn "reattaching attachments to maps"; 3695 warn "reattaching attachments to maps";
2931 reattach $_ for values %MAP; 3696 reattach $_ for values %MAP;
2932 warn "reattaching attachments to players"; 3697 warn "reattaching attachments to players";
2933 reattach $_ for values %PLAYER; 3698 reattach $_ for values %PLAYER;
2934 3699
2935 warn "leaving sync_job"; 3700 warn "leaving sync_job";
2936 3701
2937 1 3702 1
2938 } or do { 3703 } or do {
2939 warn $@; 3704 warn $@;
2940 warn "error while reloading, exiting."; 3705 cf::cleanup "error while reloading, exiting.";
2941 exit 1;
2942 }; 3706 };
2943 3707
2944 warn "reloaded"; 3708 warn "reloaded";
3709 --$RELOAD;
3710 }
2945}; 3711};
2946 3712
2947our $RELOAD_WATCHER; # used only during reload 3713our $RELOAD_WATCHER; # used only during reload
2948 3714
2949sub reload_perl() { 3715sub reload_perl() {
2950 # doing reload synchronously and two reloads happen back-to-back, 3716 # doing reload synchronously and two reloads happen back-to-back,
2951 # coro crashes during coro_state_free->destroy here. 3717 # coro crashes during coro_state_free->destroy here.
2952 3718
2953 $RELOAD_WATCHER ||= Event->timer ( 3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2954 reentrant => 0,
2955 after => 0,
2956 data => WF_AUTOCANCEL,
2957 cb => sub {
2958 do_reload_perl; 3720 do_reload_perl;
2959 undef $RELOAD_WATCHER; 3721 undef $RELOAD_WATCHER;
2960 },
2961 ); 3722 };
2962} 3723}
2963 3724
2964register_command "reload" => sub { 3725register_command "reload" => sub {
2965 my ($who, $arg) = @_; 3726 my ($who, $arg) = @_;
2966 3727
2967 if ($who->flag (FLAG_WIZ)) { 3728 if ($who->flag (FLAG_WIZ)) {
2968 $who->message ("reloading server."); 3729 $who->message ("reloading server.");
3730 async {
3731 $Coro::current->{desc} = "perl_reload";
2969 async { reload_perl }; 3732 reload_perl;
3733 };
2970 } 3734 }
2971}; 3735};
2972 3736
2973unshift @INC, $LIBDIR; 3737unshift @INC, $LIBDIR;
2974 3738
2976 3740
2977our @WAIT_FOR_TICK; 3741our @WAIT_FOR_TICK;
2978our @WAIT_FOR_TICK_BEGIN; 3742our @WAIT_FOR_TICK_BEGIN;
2979 3743
2980sub wait_for_tick { 3744sub wait_for_tick {
2981 return unless $TICK_WATCHER->is_active;
2982 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
2983 3746
2984 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
2985 push @WAIT_FOR_TICK, $signal; 3748 push @WAIT_FOR_TICK, $signal;
2986 $signal->wait; 3749 $signal->wait;
2987} 3750}
2988 3751
2989sub wait_for_tick_begin { 3752sub wait_for_tick_begin {
2990 return unless $TICK_WATCHER->is_active;
2991 return if $Coro::current == $Coro::main; 3753 return if tick_inhibit || $Coro::current == $Coro::main;
2992 3754
2993 my $signal = new Coro::Signal; 3755 my $signal = new Coro::Signal;
2994 push @WAIT_FOR_TICK_BEGIN, $signal; 3756 push @WAIT_FOR_TICK_BEGIN, $signal;
2995 $signal->wait; 3757 $signal->wait;
2996} 3758}
2997 3759
2998 my $min = 1e6;#d# 3760sub tick {
2999 my $avg = 10;
3000$TICK_WATCHER = Event->timer (
3001 reentrant => 0,
3002 parked => 1,
3003 prio => 0,
3004 at => $NEXT_TICK || $TICK,
3005 data => WF_AUTOCANCEL,
3006 cb => sub {
3007 if ($Coro::current != $Coro::main) { 3761 if ($Coro::current != $Coro::main) {
3008 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"
3009 unless ++$bug_warning > 10; 3763 unless ++$bug_warning > 10;
3010 return; 3764 return;
3011 } 3765 }
3012 3766
3013 $NOW = $tick_start = Event::time;
3014
3015 cf::server_tick; # one server iteration 3767 cf::server_tick; # one server iteration
3016 3768
3017 0 && sync_job {#d# 3769 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3018 for(1..10) { 3770 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3019 my $t = Event::time; 3771 Coro::async_pool {
3020 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3772 $Coro::current->{desc} = "runtime saver";
3021 or die; 3773 write_runtime_sync
3022 3774 or warn "ERROR: unable to write runtime file: $!";
3023 $map->width (50);
3024 $map->height (50);
3025 $map->alloc;
3026 $map->_load_objects ("/tmp/x.map", 1);
3027 my $t = Event::time - $t;
3028
3029 #next unless $t < 0.0013;#d#
3030 if ($t < $min) {
3031 $min = $t;
3032 }
3033 $avg = $avg * 0.99 + $t * 0.01;
3034 }
3035 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3036 exit 0;
3037 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3038 }; 3775 };
3776 }
3039 3777
3040 $RUNTIME += $TICK;
3041 $NEXT_TICK += $TICK;
3042
3043 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3044 $NEXT_RUNTIME_WRITE = $NOW + 10;
3045 Coro::async_pool {
3046 write_runtime
3047 or warn "ERROR: unable to write runtime file: $!";
3048 };
3049 }
3050
3051# my $AFTER = Event::time;
3052# warn $AFTER - $NOW;#d#
3053
3054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3778 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3055 $sig->send; 3779 $sig->send;
3056 } 3780 }
3057 while (my $sig = shift @WAIT_FOR_TICK) { 3781 while (my $sig = shift @WAIT_FOR_TICK) {
3058 $sig->send; 3782 $sig->send;
3059 } 3783 }
3060 3784
3061 $NOW = Event::time; 3785 $LOAD = ($NOW - $TICK_START) / $TICK;
3062
3063 # if we are delayed by four ticks or more, skip them all
3064 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3065
3066 $TICK_WATCHER->at ($NEXT_TICK);
3067 $TICK_WATCHER->start;
3068
3069 $LOAD = ($NOW - $tick_start) / $TICK;
3070 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3786 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3071 3787
3072 _post_tick; 3788 if (0) {
3073 3789 if ($NEXT_TICK) {
3074 3790 my $jitter = $TICK_START - $NEXT_TICK;
3791 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3792 warn "jitter $JITTER\n";#d#
3793 }
3075 }, 3794 }
3076); 3795}
3077 3796
3078{ 3797{
3079 BDB::max_poll_time $TICK * 0.1; 3798 # configure BDB
3080 $BDB_POLL_WATCHER = Event->io ( 3799
3081 reentrant => 0,
3082 fd => BDB::poll_fileno,
3083 poll => 'r',
3084 prio => 0,
3085 data => WF_AUTOCANCEL,
3086 cb => \&BDB::poll_cb,
3087 );
3088 BDB::min_parallel 8; 3800 BDB::min_parallel 8;
3089 3801 BDB::max_poll_reqs $TICK * 0.1;
3090 BDB::set_sync_prepare { 3802 $AnyEvent::BDB::WATCHER->priority (1);
3091 my $status;
3092 my $current = $Coro::current;
3093 (
3094 sub {
3095 $status = $!;
3096 $current->ready; undef $current;
3097 },
3098 sub {
3099 Coro::schedule while defined $current;
3100 $! = $status;
3101 },
3102 )
3103 };
3104 3803
3105 unless ($DB_ENV) { 3804 unless ($DB_ENV) {
3106 $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);
3107 3811
3108 cf::sync_job { 3812 cf::sync_job {
3109 eval { 3813 eval {
3110 BDB::db_env_open 3814 BDB::db_env_open
3111 $DB_ENV, 3815 $DB_ENV,
3113 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
3114 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3818 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3115 0666; 3819 0666;
3116 3820
3117 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3821 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3118
3119 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3120 $DB_ENV->set_lk_detect;
3121 }; 3822 };
3122 3823
3123 cf::cleanup "db_env_open(db): $@" if $@; 3824 cf::cleanup "db_env_open(db): $@" if $@;
3124 }; 3825 };
3125 } 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 };
3126} 3837}
3127 3838
3128{ 3839{
3840 # configure IO::AIO
3841
3129 IO::AIO::min_parallel 8; 3842 IO::AIO::min_parallel 8;
3130
3131 undef $Coro::AIO::WATCHER;
3132 IO::AIO::max_poll_time $TICK * 0.1; 3843 IO::AIO::max_poll_time $TICK * 0.1;
3133 $AIO_POLL_WATCHER = Event->io ( 3844 undef $AnyEvent::AIO::WATCHER;
3134 reentrant => 0,
3135 data => WF_AUTOCANCEL,
3136 fd => IO::AIO::poll_fileno,
3137 poll => 'r',
3138 prio => 6,
3139 cb => \&IO::AIO::poll_cb,
3140 );
3141} 3845}
3142 3846
3143my $_log_backtrace; 3847my $_log_backtrace;
3144 3848
3145sub _log_backtrace { 3849sub _log_backtrace {
3148 $msg =~ s/\n//; 3852 $msg =~ s/\n//;
3149 3853
3150 # limit the # of concurrent backtraces 3854 # limit the # of concurrent backtraces
3151 if ($_log_backtrace < 2) { 3855 if ($_log_backtrace < 2) {
3152 ++$_log_backtrace; 3856 ++$_log_backtrace;
3857 my $perl_bt = Carp::longmess $msg;
3153 async { 3858 async {
3859 $Coro::current->{desc} = "abt $msg";
3860
3154 my @bt = fork_call { 3861 my @bt = fork_call {
3155 @addr = map { sprintf "%x", $_ } @addr; 3862 @addr = map { sprintf "%x", $_ } @addr;
3156 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3863 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3157 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 |"
3158 or die "addr2line: $!"; 3865 or die "addr2line: $!";
3166 } 3873 }
3167 3874
3168 @funcs 3875 @funcs
3169 }; 3876 };
3170 3877
3171 LOG llevInfo, "[ABT] $msg\n"; 3878 LOG llevInfo, "[ABT] $perl_bt\n";
3879 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3172 LOG llevInfo, "[ABT] $_\n" for @bt; 3880 LOG llevInfo, "[ABT] $_\n" for @bt;
3173 --$_log_backtrace; 3881 --$_log_backtrace;
3174 }; 3882 };
3175 } else { 3883 } else {
3176 LOG llevInfo, "[ABT] $msg\n"; 3884 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines