ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines