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.282 by elmex, Tue Jun 19 18:15:34 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 = ();
51 85
52our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 87our %EXTCMD = ();
88our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
56 91
57our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
59 96
60our $CONFDIR = confdir; 97our $CONFDIR = confdir;
61our $DATADIR = datadir; 98our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
71 112
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 115our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
79 117
118our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 120our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 121our $DB_ENV;
122
123our @EXTRA_MODULES = qw(pod match mapscript);
82 124
83our %CFG; 125our %CFG;
84 126
85our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 128our $RUNTIME;
129our $NOW;
87 130
88our %PLAYER; # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 132our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
91 134
92# 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 ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 137
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
97our $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 :)
98 147
99binmode STDOUT; 148binmode STDOUT;
100binmode STDERR; 149binmode STDERR;
101 150
102# read virtual server time, if available 151# read virtual server time, if available
103unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
104 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
105 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
106 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
107} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
108 159
109mkdir $_ 160mkdir $_
110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
111 162
112our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
113 164
114sub 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::"} };
115 177
116############################################################################# 178#############################################################################
117 179
118=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
119 181
… …
155 217
156The raw value load value from the last tick. 218The raw value load value from the last tick.
157 219
158=item %cf::CFG 220=item %cf::CFG
159 221
160Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 223from wherever your confdir points to.
162 224
163=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
164 226
165These 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
166returns 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
167per 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.
168 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
169=back 243=back
170 244
171=cut 245=cut
172 246
173BEGIN { 247$Coro::State::WARNHOOK = sub {
174 *CORE::GLOBAL::warn = sub {
175 my $msg = join "", @_; 248 my $msg = join "", @_;
176 249
177 $msg .= "\n" 250 $msg .= "\n"
178 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
179 252
180 $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;
181 254
182 utf8::encode $msg;
183 LOG llevError, $msg; 255 LOG llevError, $msg;
184 }; 256};
185} 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};
186 271
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
197for my $pkg (qw( 282for my $pkg (qw(
198 cf::global cf::attachable 283 cf::global cf::attachable
199 cf::object cf::object::player 284 cf::object cf::object::player
200 cf::client cf::player 285 cf::client cf::player
201 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
202 cf::map cf::party cf::region 288 cf::party cf::region
203)) { 289)) {
204 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 291}
207 292
208$Event::DIED = sub { 293$EV::DIED = sub {
209 warn "error in event callback: @_"; 294 warn "error in event callback: @_";
210}; 295};
211 296
212############################################################################# 297#############################################################################
213 298
… …
236 $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;
237 $d 322 $d
238 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
239} 324}
240 325
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
244 327
245Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
246 329
247=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
248 331
249Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
250 333
334=cut
335
336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337
338sub encode_json($) { $json_coder->encode ($_[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}
354
251=item cf::lock_wait $string 355=item cf::lock_wait $string
252 356
253Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
254 358
255=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
256 360
257Wait 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
258a 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,
259for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
260returned. 364returned.
261 365
366Locks are *not* recursive, locking from the same coro twice results in a
367deadlocked coro.
368
262Lock 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
263uses map_find and cf::map::load uses map_load). 370uses map_find and cf::map::load uses map_load).
264 371
265=item $locked = cf::lock_active $string 372=item $locked = cf::lock_active $string
266 373
267Return 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.
268 375
269=cut 376=cut
270 377
271our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
272 379
273sub lock_wait($) { 380sub lock_wait($) {
274 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
275
276 # wait for lock, if any
277 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule;
280 }
281} 382}
282 383
283sub lock_acquire($) { 384sub lock_acquire($) {
284 my ($key) = @_; 385 $LOCKS->guard ($_[0])
285
286 # wait, to be sure we are not locked
287 lock_wait $key;
288
289 $LOCK{$key} = [];
290
291 Coro::guard {
292 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} };
294 }
295} 386}
296 387
297sub lock_active($) { 388sub lock_active($) {
298 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
299
300 ! ! $LOCK{$key}
301} 390}
302 391
303sub freeze_mainloop { 392sub freeze_mainloop {
304 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
305 394
306 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
307 $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 }
308 }; 456 }
309 $TICK_WATCHER->stop; 457};
310 $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;
311} 471}
312 472
313=item cf::async { BLOCK } 473=item cf::async { BLOCK }
314 474
315Currently the same as Coro::async_pool, meaning you cannot use 475Currently the same as Coro::async_pool, meaning you cannot use
… …
320 480
321BEGIN { *async = \&Coro::async_pool } 481BEGIN { *async = \&Coro::async_pool }
322 482
323=item cf::sync_job { BLOCK } 483=item cf::sync_job { BLOCK }
324 484
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 485The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 486is always able to handle events or runnable, as Deliantra is only
327partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 487partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable. 488acceptable.
329 489
330If 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
331the given BLOCK in another coroutine while waiting for the result. The 491the given BLOCK in another coroutine while waiting for the result. The
… …
336 496
337sub sync_job(&) { 497sub sync_job(&) {
338 my ($job) = @_; 498 my ($job) = @_;
339 499
340 if ($Coro::current == $Coro::main) { 500 if ($Coro::current == $Coro::main) {
341 my $time = Event::time; 501 my $time = EV::time;
342 502
343 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
345 505
346 # TODO: use suspend/resume instead 506 LOG llevError, Carp::longmess "sync job";#d#
347 # (but this is cancel-safe) 507
348 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
349 509
350 my $busy = 1; 510 my $busy = 1;
351 my @res; 511 my @res;
352 512
353 (async { 513 (async {
514 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 515 @res = eval { $job->() };
355 warn $@ if $@; 516 warn $@ if $@;
356 undef $busy; 517 undef $busy;
357 })->prio (Coro::PRIO_MAX); 518 })->prio (Coro::PRIO_MAX);
358 519
359 while ($busy) { 520 while ($busy) {
360 Coro::cede or Event::one_event; 521 if (Coro::nready) {
522 Coro::cede_notself;
523 } else {
524 EV::loop EV::LOOP_ONESHOT;
361 } 525 }
526 }
362 527
363 $time = Event::time - $time; 528 my $time = EV::time - $time;
364 529
365 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367
368 $tick_start += $time; # do not account sync jobs to server load 530 $TICK_START += $time; # do not account sync jobs to server load
369 531
370 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
371 } else { 533 } else {
372 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
373 535
… …
398=item fork_call { }, $args 560=item fork_call { }, $args
399 561
400Executes the given code block with the given arguments in a seperate 562Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 563process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 564Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 565never block itself or use any form of event handling.
404 566
405=cut 567=cut
406 568
407sub fork_call(&@) { 569sub fork_call(&@) {
408 my ($cb, @args) = @_; 570 my ($cb, @args) = @_;
409 571
410# 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,
411# or die "socketpair: $!"; 573 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 574 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 575
415 if (my $pid = fork) { 576 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 577 reset_signals;
428 local $SIG{__WARN__}; 578 &$cb
429 local $SIG{__DIE__}; 579 }, @args;
430 eval {
431 close $fh1;
432 580
433 my @res = eval { $cb->(@args) }; 581 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 582}
435 };
436 583
437 warn $@ if $@; 584=item $coin = coin_from_name $name
438 _exit 0; 585
439 } 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
440} 609}
441 610
442=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
443 612
444Returns a single value from the environment database. 613Returns a single value from the environment database.
… …
446=item cf::db_put $family => $key => $value 615=item cf::db_put $family => $key => $value
447 616
448Stores 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
449data 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).
450 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
451=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}
452 643
453our $DB; 644our $DB;
454 645
455sub db_init { 646sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 647 cf::sync_job {
460 eval { 648 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 649 };
470} 650}
471 651
472sub db_get($$) { 652sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 653 my $key = "$_[0]/$_[1]";
474 654
… …
524 if (1) { 704 if (1) {
525 $md5 = 705 $md5 =
526 join "\x00", 706 join "\x00",
527 $processversion, 707 $processversion,
528 map { 708 map {
529 Coro::cede; 709 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 710 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 711 } 0.. $#$src;
532 712
533 713
534 my $dbmd5 = db_get cache => "$id/md5"; 714 my $dbmd5 = db_get cache => "$id/md5";
… …
572 752
573############################################################################# 753#############################################################################
574 754
575=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
576 756
577Many 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
578attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
580 760
581In 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>
582C<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
583Crossfire TRT). 763Deliantra).
584 764
585=over 4 765=over 4
586 766
587=item $attachable->attach ($attachment, key => $value...) 767=item $attachable->attach ($attachment, key => $value...)
588 768
… …
632=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
633 813
634Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
635given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
636 816
637Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
638that 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.
639 819
640These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
641 821
642=over 4 822=over 4
… …
840 "; 1020 ";
841 die if $@; 1021 die if $@;
842} 1022}
843 1023
844our $override; 1024our $override;
845our @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?
846 1026
847sub override { 1027sub override {
848 $override = 1; 1028 $override = 1;
849 @invoke_results = (); 1029 @INVOKE_RESULTS = (@_);
850} 1030}
851 1031
852sub do_invoke { 1032sub do_invoke {
853 my $event = shift; 1033 my $event = shift;
854 my $callbacks = shift; 1034 my $callbacks = shift;
855 1035
856 @invoke_results = (); 1036 @INVOKE_RESULTS = ();
857 1037
858 local $override; 1038 local $override;
859 1039
860 for (@$callbacks) { 1040 for (@$callbacks) {
861 eval { &{$_->[1]} }; 1041 eval { &{$_->[1]} };
… …
870 } 1050 }
871 1051
872 0 1052 0
873} 1053}
874 1054
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 1056
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 1058
879Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
880 1060
881This 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
882removed 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
883results (if you must, access C<@cf::invoke_results> directly). 1063results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 1064
885=back 1065=back
886 1066
887=cut 1067=cut
888 1068
889############################################################################# 1069#############################################################################
890# 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}
891 1113
892sub reattach { 1114sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1116 my ($obj) = @_;
895 1117
1118 # no longer needed after getting rid of delete_package?
896 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
897 1120
898 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
899 1122
900 @$registry = (); 1123 @$registry = ();
901 1124
… …
916cf::attachable->attach ( 1139cf::attachable->attach (
917 prio => -1000000, 1140 prio => -1000000,
918 on_instantiate => sub { 1141 on_instantiate => sub {
919 my ($obj, $data) = @_; 1142 my ($obj, $data) = @_;
920 1143
921 $data = from_json $data; 1144 $data = decode_json $data;
922 1145
923 for (@$data) { 1146 for (@$data) {
924 my ($name, $args) = @$_; 1147 my ($name, $args) = @$_;
925 1148
926 $obj->attach ($name, %{$args || {} }); 1149 $obj->attach ($name, %{$args || {} });
… …
942sub object_freezer_save { 1165sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1166 my ($filename, $rdata, $objs) = @_;
944 1167
945 sync_job { 1168 sync_job {
946 if (length $$rdata) { 1169 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
949 1173
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 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 }
954 close $fh; 1181 aio_close $fh;
955 1182
956 if (@$objs) { 1183 if (@$objs) {
957 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) {
958 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
961 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 }
962 close $fh; 1192 aio_close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
964 } 1194 }
965 } else { 1195 } else {
966 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
967 } 1197 }
968 1198
969 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
970 } else { 1203 } else {
971 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
972 } 1205 }
973 } else { 1206 } else {
974 aio_unlink $filename; 1207 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
976 } 1209 }
977 } 1210 };
978} 1211}
979 1212
980sub object_freezer_as_string { 1213sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1214 my ($rdata, $objs) = @_;
982 1215
… …
994 or return; 1227 or return;
995 1228
996 unless (aio_stat "$filename.pst") { 1229 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1230 (aio_load "$filename.pst", $av) >= 0
998 or return; 1231 or return;
1232
999 $av = eval { (Storable::thaw $av)->{objs} }; 1233 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs};
1000 } 1235 }
1001 1236
1237 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1238 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1239 $decname, length $data, scalar @{$av || []};
1240
1004 return ($data, $av); 1241 ($data, $av)
1005} 1242}
1006 1243
1007=head2 COMMAND CALLBACKS 1244=head2 COMMAND CALLBACKS
1008 1245
1009=over 4 1246=over 4
… …
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1266 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1267}
1031 1268
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1269=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1270
1034Register a callback fro execution when the client sends an extcmd packet. 1271Register a callback for execution when the client sends an (synchronous)
1272extcmd packet. Ext commands will be processed in the order they are
1273received by the server, like other user commands. The first argument is
1274the logged-in player. Ext commands can only be processed after a player
1275has logged in successfully.
1035 1276
1036If the callback returns something, it is sent back as if reply was being 1277If the callback returns something, it is sent back as if reply was being
1037called. 1278called.
1038 1279
1280=item cf::register_exticmd $name => \&callback($ns,$packet);
1281
1282Register a callback for execution when the client sends an (asynchronous)
1283exticmd packet. Exti commands are processed by the server as soon as they
1284are received, i.e. out of order w.r.t. other commands. The first argument
1285is a client socket. Exti commands can be received anytime, even before
1286log-in.
1287
1288If the callback returns something, it is sent back as if reply was being
1289called.
1290
1039=cut 1291=cut
1040 1292
1041sub register_extcmd { 1293sub register_extcmd {
1042 my ($name, $cb) = @_; 1294 my ($name, $cb) = @_;
1043 1295
1044 $EXTCMD{$name} = $cb; 1296 $EXTCMD{$name} = $cb;
1045} 1297}
1298
1299sub register_exticmd {
1300 my ($name, $cb) = @_;
1301
1302 $EXTICMD{$name} = $cb;
1303}
1304
1305use File::Glob ();
1046 1306
1047cf::player->attach ( 1307cf::player->attach (
1048 on_command => sub { 1308 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1050 1310
… …
1058 cf::override; 1318 cf::override;
1059 }, 1319 },
1060 on_extcmd => sub { 1320 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1321 my ($pl, $buf) = @_;
1062 1322
1063 my $msg = eval { from_json $buf }; 1323 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1324
1065 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
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1333 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1334 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1335 }
1336
1337 $pl->ext_reply ($reply, @reply)
1338 if $reply;
1339
1071 } else { 1340 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1341 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1342 }
1074 1343
1075 cf::override; 1344 cf::override;
1076 }, 1345 },
1077); 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}
1078 1360
1079sub load_extensions { 1361sub load_extensions {
1080 cf::sync_job { 1362 cf::sync_job {
1081 my %todo; 1363 my %todo;
1082 1364
… …
1102 1384
1103 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1104 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1105 1387
1106 $ext{source} = 1388 $ext{source} =
1107 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1108 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1109 . $source 1391 . $source
1110 . "\n};\n1"; 1392 . "\n};\n1";
1111 1393
1112 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
… …
1128 my $msg = $@ ? "$v->{path}: $@\n" 1410 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n"; 1411 : "$v->{base}: extension inactive.\n";
1130 1412
1131 if (exists $v->{meta}{mandatory}) { 1413 if (exists $v->{meta}{mandatory}) {
1132 warn $msg; 1414 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n"; 1415 cf::cleanup "mandatory extension failed to load, exiting.";
1134 exit 1;
1135 } 1416 }
1136 1417
1137 warn $msg; 1418 warn $msg;
1138 } 1419 }
1139 1420
… …
1153 1434
1154=back 1435=back
1155 1436
1156=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1157 1438
1158Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1159 1440
1160=cut 1441=cut
1161 1442
1162package cf::player; 1443package cf::player;
1163 1444
1164use Coro::AIO; 1445use Coro::AIO;
1165 1446
1166=head3 cf::player 1447=head3 cf::player
1167 1448
1168=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}
1169 1464
1170=item cf::player::find $login 1465=item cf::player::find $login
1171 1466
1172Returns the given player object, loading it if necessary (might block). 1467Returns the given player object, loading it if necessary (might block).
1173 1468
… …
1192 1487
1193sub exists($) { 1488sub exists($) {
1194 my ($login) = @_; 1489 my ($login) = @_;
1195 1490
1196 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1197 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1198} 1493}
1199 1494
1200sub find($) { 1495sub find($) {
1201 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1202 my $login = $_[0]; 1497 my $login = $_[0];
… …
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1504 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1505 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1506 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1507 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1508
1214 my $pl = load_pl path $login 1509 my $f = new_from_file cf::object::thawer path $login
1215 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;
1216 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1217 } 1518 }
1218 } 1519 }
1219} 1520}
1220 1521
… …
1229 return if $pl->{deny_save}; 1530 return if $pl->{deny_save};
1230 1531
1231 aio_mkdir playerdir $pl, 0770; 1532 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1533 $pl->{last_save} = $cf::RUNTIME;
1233 1534
1535 cf::get_slot 0.01;
1536
1234 $pl->save_pl ($path); 1537 $pl->save_pl ($path);
1235 Coro::cede; 1538 cf::cede_to_tick;
1236} 1539}
1237 1540
1238sub new($) { 1541sub new($) {
1239 my ($login) = @_; 1542 my ($login) = @_;
1240 1543
… …
1246 $cf::PLAYER{$login} = $self; 1549 $cf::PLAYER{$login} = $self;
1247 1550
1248 $self 1551 $self
1249} 1552}
1250 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
1251=item $pl->quit_character 1564=item $pl->quit_character
1252 1565
1253Nukes the player without looking back. If logged in, the connection will 1566Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1567be destroyed. May block for a long time.
1255 1568
… …
1259 my ($pl) = @_; 1572 my ($pl) = @_;
1260 1573
1261 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1262 1575
1263 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1264 $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
1265 1578
1266 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1267 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1268 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1269 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1270 1585
1271 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1272 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1308 or return []; 1623 or return [];
1309 1624
1310 my @logins; 1625 my @logins;
1311 1626
1312 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") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1636 }
1316 1637
1317 utf8::decode $login; 1638 utf8::decode $login;
1318 push @logins, $login; 1639 push @logins, $login;
1319 } 1640 }
1320 1641
… …
1347 } 1668 }
1348 1669
1349 \@paths 1670 \@paths
1350} 1671}
1351 1672
1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1674
1675Expand deliantra pod fragments into protocol xml.
1676
1352=item $player->ext_reply ($msgid, %msg) 1677=item $player->ext_reply ($msgid, @msg)
1353 1678
1354Sends an ext reply to the player. 1679Sends an ext reply to the player.
1355 1680
1356=cut 1681=cut
1357 1682
1358sub ext_reply($$%) { 1683sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1684 my ($self, $id, @msg) = @_;
1360 1685
1361 $msg{msgid} = $id; 1686 $self->ns->ext_reply ($id, @msg)
1362
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1687}
1365 1688
1366=item $player->ext_event ($type, %msg) 1689=item $player->ext_msg ($type, @msg)
1367 1690
1368Sends an ext event to the client. 1691Sends an ext event to the client.
1369 1692
1370=cut 1693=cut
1371 1694
1372sub ext_event($$%) { 1695sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1696 my ($self, $type, @msg) = @_;
1374 1697
1375 $self->ns->ext_event ($type, %msg); 1698 $self->ns->ext_msg ($type, @msg);
1376} 1699}
1377 1700
1378=head3 cf::region 1701=head3 cf::region
1379 1702
1380=over 4 1703=over 4
… …
1393 my ($path) = @_; 1716 my ($path) = @_;
1394 1717
1395 my ($match, $specificity); 1718 my ($match, $specificity);
1396 1719
1397 for my $region (list) { 1720 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1721 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1722 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1723 if $region->specificity > $specificity;
1401 } 1724 }
1402 } 1725 }
1403 1726
… …
1424our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1425our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1426 1749
1427sub generate_random_map { 1750sub generate_random_map {
1428 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
1429 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1430 $self->_create_random_map ( 1756 $self->_create_random_map (
1431 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1432 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1433 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1523 $self->init; # pass $1 etc. 1849 $self->init; # pass $1 etc.
1524 return $self; 1850 return $self;
1525 } 1851 }
1526 } 1852 }
1527 1853
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1854 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1855 ()
1530} 1856}
1531 1857
1532sub init { 1858sub init {
1533 my ($self) = @_; 1859 my ($self) = @_;
… …
1555 1881
1556# the temporary/swap location 1882# the temporary/swap location
1557sub save_path { 1883sub save_path {
1558 my ($self) = @_; 1884 my ($self) = @_;
1559 1885
1560 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1561 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1562} 1888}
1563 1889
1564# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1565sub uniq_path { 1891sub uniq_path {
1566 my ($self) = @_; 1892 my ($self) = @_;
1567 1893
1568 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1569 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1570}
1571
1572# and all this just because we cannot iterate over
1573# all maps in C++...
1574sub change_all_map_light {
1575 my ($change) = @_;
1576
1577 $_->change_map_light ($change)
1578 for grep $_->outdoor, values %cf::MAP;
1579} 1896}
1580 1897
1581sub decay_objects { 1898sub decay_objects {
1582 my ($self) = @_; 1899 my ($self) = @_;
1583 1900
… …
1596 1913
1597sub load_header_from($) { 1914sub load_header_from($) {
1598 my ($self, $path) = @_; 1915 my ($self, $path) = @_;
1599 1916
1600 utf8::encode $path; 1917 utf8::encode $path;
1601 #aio_open $path, O_RDONLY, 0 1918 my $f = new_from_file cf::object::thawer $path
1602 # or return;
1603
1604 $self->_load_header ($path)
1605 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;
1606 1926
1607 $self->{load_path} = $path; 1927 $self->{load_path} = $path;
1608 1928
1609 1 1929 1
1610} 1930}
… …
1664sub find { 1984sub find {
1665 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1666 1986
1667 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1668 1988
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1669 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1670 1991
1671 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1672 my $guard = cf::lock_acquire "map_find:$path";
1673 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1674 or return; 1994 or return;
1675 1995
1676 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1677 1997
… …
1679 or return; 1999 or return;
1680 2000
1681 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
1683 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
2005 undef $guard1;
1684 $map->reset; 2006 $map->reset;
1685 undef $guard;
1686 return find $path; 2007 return find $path;
1687 } 2008 }
1688 2009
1689 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
1690 } 2011 }
… …
1699 local $self->{deny_reset} = 1; # loading can take a long time 2020 local $self->{deny_reset} = 1; # loading can take a long time
1700 2021
1701 my $path = $self->{path}; 2022 my $path = $self->{path};
1702 2023
1703 { 2024 {
1704 my $guard = cf::lock_acquire "map_load:$path"; 2025 my $guard = cf::lock_acquire "map_data:$path";
1705 2026
2027 return unless $self->valid;
1706 return if $self->in_memory != cf::MAP_SWAPPED; 2028 return unless $self->in_memory == cf::MAP_SWAPPED;
1707 2029
1708 $self->in_memory (cf::MAP_LOADING); 2030 $self->in_memory (cf::MAP_LOADING);
1709 2031
1710 $self->alloc; 2032 $self->alloc;
1711 2033
1712 $self->pre_load; 2034 $self->pre_load;
1713 Coro::cede; 2035 cf::cede_to_tick;
1714 2036
2037 my $f = new_from_file cf::object::thawer $self->{load_path};
2038 $f->skip_block;
1715 $self->_load_objects ($self->{load_path}, 1) 2039 $self->_load_objects ($f)
1716 or return; 2040 or return;
1717 2041
1718 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
1719 if delete $self->{load_original}; 2043 if delete $self->{load_original};
1720 2044
1721 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
1722 utf8::encode $uniq; 2046 utf8::encode $uniq;
1723 if (aio_open $uniq, O_RDONLY, 0) { 2047 unless (aio_stat $uniq) {
2048 if (my $f = new_from_file cf::object::thawer $uniq) {
1724 $self->clear_unique_items; 2049 $self->clear_unique_items;
1725 $self->_load_objects ($uniq, 0); 2050 $self->_load_objects ($f);
2051 $f->resolve_delayed_derefs;
2052 }
1726 } 2053 }
1727 } 2054 }
1728 2055
1729 Coro::cede; 2056 $f->resolve_delayed_derefs;
2057
2058 cf::cede_to_tick;
1730 # now do the right thing for maps 2059 # now do the right thing for maps
1731 $self->link_multipart_objects; 2060 $self->link_multipart_objects;
1732 $self->difficulty ($self->estimate_difficulty) 2061 $self->difficulty ($self->estimate_difficulty)
1733 unless $self->difficulty; 2062 unless $self->difficulty;
1734 Coro::cede; 2063 cf::cede_to_tick;
1735 2064
1736 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
1737 $self->decay_objects; 2066 $self->decay_objects;
1738 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
1739 $self->update_buttons; 2068 $self->update_buttons;
1740 Coro::cede; 2069 cf::cede_to_tick;
1741 $self->set_darkness_map;
1742 Coro::cede;
1743 $self->activate; 2070 $self->activate;
1744 } 2071 }
1745 2072
2073 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME);
2075
1746 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
1747 } 2077 }
1748 2078
1749 $self->post_load; 2079 $self->post_load;
1750} 2080}
1751 2081
… …
1760 2090
1761 $self 2091 $self
1762} 2092}
1763 2093
1764# 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
1765sub load_diag { 2095sub load_neighbours {
1766 my ($map) = @_; 2096 my ($map) = @_;
1767 2097
1768 my @diag; # diagonal neighbours 2098 my @neigh; # diagonal neighbours
1769 2099
1770 for (0 .. 3) { 2100 for (0 .. 3) {
1771 my $neigh = $map->tile_path ($_) 2101 my $neigh = $map->tile_path ($_)
1772 or next; 2102 or next;
1773 $neigh = find $neigh, $map 2103 $neigh = find $neigh, $map
1774 or next; 2104 or next;
1775 $neigh->load; 2105 $neigh->load;
1776 2106
2107 push @neigh,
1777 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1778 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1779 } 2110 }
1780 2111
1781 for (@diag) { 2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
1782 my $neigh = find @$_ 2114 my $neigh = find $path, $origin
1783 or next; 2115 or next;
1784 $neigh->load; 2116 $neigh->load;
1785 } 2117 }
1786} 2118}
1787 2119
… …
1792} 2124}
1793 2125
1794sub do_load_sync { 2126sub do_load_sync {
1795 my ($map) = @_; 2127 my ($map) = @_;
1796 2128
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main;
2131
1797 cf::sync_job { $map->load }; 2132 cf::sync_job { $map->load };
1798} 2133}
1799 2134
1800our %MAP_PREFETCH; 2135our %MAP_PREFETCH;
1801our $MAP_PREFETCHER = undef; 2136our $MAP_PREFETCHER = undef;
1802 2137
1803sub find_async { 2138sub find_async {
1804 my ($path, $origin) = @_; 2139 my ($path, $origin, $load) = @_;
1805 2140
1806 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
1807 2142
1808 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
1809 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1810 } 2145 }
1811 2146
1812 undef $MAP_PREFETCH{$path}; 2147 $MAP_PREFETCH{$path} |= $load;
2148
1813 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
1814 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
1816 my $map = find $path 2154 if (my $map = find $k) {
1817 or next;
1818 $map->load; 2155 $map->load if $v;
2156 }
1819 2157
1820 delete $MAP_PREFETCH{$path}; 2158 delete $MAP_PREFETCH{$k};
1821 } 2159 }
1822 } 2160 }
1823 undef $MAP_PREFETCHER; 2161 undef $MAP_PREFETCHER;
1824 }; 2162 };
1825 $MAP_PREFETCHER->prio (6); 2163 $MAP_PREFETCHER->prio (6);
… …
1828} 2166}
1829 2167
1830sub save { 2168sub save {
1831 my ($self) = @_; 2169 my ($self) = @_;
1832 2170
1833 my $lock = cf::lock_acquire "map_data:" . $self->path; 2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
1834 2172
1835 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
1836 2174
1837 return unless $self->dirty; 2175 return unless $self->dirty;
1838 2176
… …
1844 return if $self->{deny_save}; 2182 return if $self->{deny_save};
1845 2183
1846 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
1847 2185
1848 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
1849 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
1850 }; 2189 };
2190
2191 cf::get_slot 0.02;
1851 2192
1852 if ($uniq) { 2193 if ($uniq) {
1853 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1854 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1855 } else { 2196 } else {
… …
1861 my ($self) = @_; 2202 my ($self) = @_;
1862 2203
1863 # save first because save cedes 2204 # save first because save cedes
1864 $self->save; 2205 $self->save;
1865 2206
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2208
1868 return if $self->players; 2209 return if $self->players;
1869 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
1870 return if $self->{deny_save}; 2211 return if $self->{deny_save};
1871 2212
2213 $self->in_memory (cf::MAP_SWAPPED);
2214
2215 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP;
1872 $self->clear; 2217 $self->clear;
1873 $self->in_memory (cf::MAP_SWAPPED);
1874} 2218}
1875 2219
1876sub reset_at { 2220sub reset_at {
1877 my ($self) = @_; 2221 my ($self) = @_;
1878 2222
… …
1896 2240
1897 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
1898 2242
1899 return if $self->players; 2243 return if $self->players;
1900 2244
1901 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
1902 2246
1903 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
1904 2248
1905 # need to save uniques path 2249 # need to save uniques path
1906 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
1910 if $uniq; 2254 if $uniq;
1911 } 2255 }
1912 2256
1913 delete $cf::MAP{$self->path}; 2257 delete $cf::MAP{$self->path};
1914 2258
2259 $self->deactivate;
2260 $_->clear_links_to ($self) for values %cf::MAP;
1915 $self->clear; 2261 $self->clear;
1916
1917 $_->clear_links_to ($self) for values %cf::MAP;
1918 2262
1919 $self->unlink_save; 2263 $self->unlink_save;
1920 $self->destroy; 2264 $self->destroy;
1921} 2265}
1922 2266
1923my $nuke_counter = "aaaa"; 2267my $nuke_counter = "aaaa";
1924 2268
1925sub nuke { 2269sub nuke {
1926 my ($self) = @_; 2270 my ($self) = @_;
1927 2271
2272 {
2273 my $lock = cf::lock_acquire "map_data:$self->{path}";
2274
1928 delete $cf::MAP{$self->path}; 2275 delete $cf::MAP{$self->path};
1929 2276
1930 $self->unlink_save; 2277 $self->unlink_save;
1931 2278
1932 bless $self, "cf::map"; 2279 bless $self, "cf::map";
1933 delete $self->{deny_reset}; 2280 delete $self->{deny_reset};
1934 $self->{deny_save} = 1; 2281 $self->{deny_save} = 1;
1935 $self->reset_timeout (1); 2282 $self->reset_timeout (1);
1936 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937 2284
1938 $cf::MAP{$self->path} = $self; 2285 $cf::MAP{$self->path} = $self;
2286 }
1939 2287
1940 $self->reset; # polite request, might not happen 2288 $self->reset; # polite request, might not happen
1941} 2289}
1942 2290
1943=item $maps = cf::map::tmp_maps 2291=item $maps = cf::map::tmp_maps
… …
1985 2333
1986sub unique_maps() { 2334sub unique_maps() {
1987 [ 2335 [
1988 map { 2336 map {
1989 utf8::decode $_; 2337 utf8::decode $_;
1990 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
1991 ? normalise $_ 2341 : normalise $_
1992 : ()
1993 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
1994 ] 2343 ]
1995} 2344}
1996 2345
1997package 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}
1998 2376
1999=back 2377=back
2000 2378
2001=head3 cf::object 2379=head3 cf::object
2002 2380
… …
2006 2384
2007=over 4 2385=over 4
2008 2386
2009=item $ob->inv_recursive 2387=item $ob->inv_recursive
2010 2388
2011Returns 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.
2012 2391
2013=cut 2392=cut
2014 2393
2015sub inv_recursive_; 2394sub inv_recursive_;
2016sub inv_recursive_ { 2395sub inv_recursive_ {
… …
2019 2398
2020sub inv_recursive { 2399sub inv_recursive {
2021 inv_recursive_ inv $_[0] 2400 inv_recursive_ inv $_[0]
2022} 2401}
2023 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
2024package cf; 2431package cf;
2025 2432
2026=back 2433=back
2027 2434
2028=head3 cf::object::player 2435=head3 cf::object::player
… …
2034Sends 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>
2035can 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
2036dialogue with the given NPC character. 2443dialogue with the given NPC character.
2037 2444
2038=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};
2039 2460
2040# rough implementation of a future "reply" method that works 2461# rough implementation of a future "reply" method that works
2041# with dialog boxes. 2462# with dialog boxes.
2042#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
2043sub cf::object::player::reply($$$;$) { 2464sub cf::object::player::reply($$$;$) {
… …
2050 2471
2051 } else { 2472 } else {
2052 my $pl = $self->contr; 2473 my $pl = $self->contr;
2053 2474
2054 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2475 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055 my $diag = $pl->{npc_dialog}; 2476 my $dialog = $pl->{npc_dialog};
2056 $diag->{pl}->ext_reply ( 2477 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057 $diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058 );
2059 2478
2060 } else { 2479 } else {
2061 $msg = $npc->name . " says: $msg" if $npc; 2480 $msg = $npc->name . " says: $msg" if $npc;
2062 $self->message ($msg, $flags); 2481 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2063 } 2482 }
2064 } 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 (@_);
2065} 2494}
2066 2495
2067=item $player_object->may ("access") 2496=item $player_object->may ("access")
2068 2497
2069Returns wether the given player is authorized to access resource "access" 2498Returns wether the given player is authorized to access resource "access"
… …
2082 2511
2083=item $player_object->enter_link 2512=item $player_object->enter_link
2084 2513
2085Freezes 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}>).
2086 2515
2087The 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.
2088I<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.
2089 2520
2090Will never block. 2521Will never block.
2091 2522
2092=item $player_object->leave_link ($map, $x, $y) 2523=item $player_object->leave_link ($map, $x, $y)
2093 2524
… …
2148 # use -1 or undef as default coordinates, not 0, 0 2579 # use -1 or undef as default coordinates, not 0, 0
2149 ($x, $y) = ($map->enter_x, $map->enter_y) 2580 ($x, $y) = ($map->enter_x, $map->enter_y)
2150 if $x <=0 && $y <= 0; 2581 if $x <=0 && $y <= 0;
2151 2582
2152 $map->load; 2583 $map->load;
2153 $map->load_diag; 2584 $map->load_neighbours;
2154 2585
2155 return unless $self->contr->active; 2586 return unless $self->contr->active;
2156 $self->activate_recursive;
2157 2587
2158 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159 $self->enter_map ($map, $x, $y); 2589 $self->enter_map ($map, $x, $y);
2160}
2161 2590
2591 # only activate afterwards, to support waiting in hooks
2592 $self->activate_recursive;
2593}
2594
2162=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2595=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163 2596
2164Moves 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
2165her, loading and preparing them map, calling the provided $check callback 2598her, loading and preparing them map, calling the provided $check callback
2166that 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
2167the 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 >>.
2168 2605
2169=cut 2606=cut
2170 2607
2171our $GOTOGEN; 2608our $GOTOGEN;
2172 2609
2173sub cf::object::player::goto { 2610sub cf::object::player::goto {
2174 my ($self, $path, $x, $y, $check) = @_; 2611 my ($self, $path, $x, $y, $check, $done) = @_;
2175 2612
2176 # 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
2177 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2614 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178 2615
2179 $self->enter_link; 2616 $self->enter_link;
2180 2617
2181 (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
2182 my $map = eval { 2640 my $map = eval {
2183 my $map = cf::map::find $path; 2641 my $map = defined $path ? cf::map::find $path : undef;
2184 2642
2185 if ($map) { 2643 if ($map) {
2186 $map = $map->customise_for ($self); 2644 $map = $map->customise_for ($self);
2187 $map = $check->($map) if $check && $map; 2645 $map = $check->($map) if $check && $map;
2188 } else { 2646 } else {
2189 $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);
2190 } 2648 }
2191 2649
2192 $map 2650 $map
2193 }; 2651 };
2194 2652
… …
2199 2657
2200 if ($gen == $self->{_goto_generation}) { 2658 if ($gen == $self->{_goto_generation}) {
2201 delete $self->{_goto_generation}; 2659 delete $self->{_goto_generation};
2202 $self->leave_link ($map, $x, $y); 2660 $self->leave_link ($map, $x, $y);
2203 } 2661 }
2662
2663 $done->() if $done;
2204 })->prio (1); 2664 })->prio (1);
2205} 2665}
2206 2666
2207=item $player_object->enter_exit ($exit_object) 2667=item $player_object->enter_exit ($exit_object)
2208 2668
… …
2228} 2688}
2229 2689
2230sub prepare_random_map { 2690sub prepare_random_map {
2231 my ($exit) = @_; 2691 my ($exit) = @_;
2232 2692
2233 my $guard = cf::lock_acquire "exit_prepare:$exit";
2234
2235 # all this does is basically replace the /! path by 2693 # all this does is basically replace the /! path by
2236 # a new random map path (?random/...) with a seed 2694 # a new random map path (?random/...) with a seed
2237 # that depends on the exit object 2695 # that depends on the exit object
2238 2696
2239 my $rmp = parse_random_map_params $exit->msg; 2697 my $rmp = parse_random_map_params $exit->msg;
… …
2241 if ($exit->map) { 2699 if ($exit->map) {
2242 $rmp->{region} = $exit->region->name; 2700 $rmp->{region} = $exit->region->name;
2243 $rmp->{origin_map} = $exit->map->path; 2701 $rmp->{origin_map} = $exit->map->path;
2244 $rmp->{origin_x} = $exit->x; 2702 $rmp->{origin_x} = $exit->x;
2245 $rmp->{origin_y} = $exit->y; 2703 $rmp->{origin_y} = $exit->y;
2704
2705 $exit->map->touch;
2246 } 2706 }
2247 2707
2248 $rmp->{random_seed} ||= $exit->random_seed; 2708 $rmp->{random_seed} ||= $exit->random_seed;
2249 2709
2250 my $data = cf::to_json $rmp; 2710 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2251 my $md5 = Digest::MD5::md5_hex $data; 2711 my $md5 = Digest::MD5::md5_hex $data;
2252 my $meta = "$RANDOMDIR/$md5.meta"; 2712 my $meta = "$RANDOMDIR/$md5.meta";
2253 2713
2254 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2714 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2255 aio_write $fh, 0, (length $data), $data, 0; 2715 aio_write $fh, 0, (length $data), $data, 0;
2256 undef $fh; 2716 undef $fh;
2257 aio_rename "$meta~", $meta; 2717 aio_rename "$meta~", $meta;
2258 2718
2719 my $slaying = "?random/$md5";
2720
2721 if ($exit->valid) {
2259 $exit->slaying ("?random/$md5"); 2722 $exit->slaying ("?random/$md5");
2260 $exit->msg (undef); 2723 $exit->msg (undef);
2724 }
2261 } 2725 }
2262} 2726}
2263 2727
2264sub cf::object::player::enter_exit { 2728sub cf::object::player::enter_exit {
2265 my ($self, $exit) = @_; 2729 my ($self, $exit) = @_;
2266 2730
2267 return unless $self->type == cf::PLAYER; 2731 return unless $self->type == cf::PLAYER;
2268 2732
2269 if ($exit->slaying eq "/!") {
2270 #TODO: this should de-fi-ni-te-ly not be a sync-job
2271 # the problem is that $exit might not survive long enough
2272 # so it needs to be done right now, right here
2273 cf::sync_job { prepare_random_map $exit };
2274 }
2275
2276 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2277 my $hp = $exit->stats->hp;
2278 my $sp = $exit->stats->sp;
2279
2280 $self->enter_link; 2733 $self->enter_link;
2281 2734
2282 (async { 2735 (async {
2283 $self->deactivate_recursive; # just to be sure 2736 $Coro::current->{desc} = "enter_exit";
2737
2284 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
2285 $self->goto ($slaying, $hp, $sp); 2753 $self->goto ($map, $x, $y);
2286 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
2287 1; 2759 1
2288 }) { 2760 }) {
2289 $self->message ("Something went wrong deep within the crossfire server. " 2761 $self->message ("Something went wrong deep within the deliantra server. "
2290 . "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. "
2291 . "Please report this to the dungeon master!", 2763 . "Please report this to the dungeon master!",
2292 cf::NDI_UNIQUE | cf::NDI_RED); 2764 cf::NDI_UNIQUE | cf::NDI_RED);
2293 2765
2294 warn "ERROR in enter_exit: $@"; 2766 warn "ERROR in enter_exit: $@";
… …
2313 2785
2314 utf8::encode $text; 2786 utf8::encode $text;
2315 $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);
2316} 2788}
2317 2789
2790=item $client->send_msg ($channel, $msg, $color, [extra...])
2791
2792Send a drawinfo or msg packet to the client, formatting the msg for the
2793client if neccessary. C<$type> should be a string identifying the type of
2794the message, with C<log> being the default. If C<$color> is negative, suppress
2795the message unless the client supports the msg packet.
2796
2797=cut
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
2913sub cf::client::send_msg {
2914 my ($self, $channel, $msg, $color, @extra) = @_;
2915
2916 $msg = $self->pl->expand_cfpod ($msg)
2917 unless $color & cf::NDI_VERBATIM;
2918
2919 $color &= cf::NDI_CLIENT_MASK; # just in case...
2920
2921 # check predefined channels, for the benefit of C
2922 if ($CHANNEL{$channel}) {
2923 $channel = $CHANNEL{$channel};
2924
2925 $self->ext_msg (channel_info => $channel);
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);
2933 }
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
2318=item $client->ext_event ($type, %msg) 2962=item $client->ext_msg ($type, @msg)
2319 2963
2320Sends an exti event to the client. 2964Sends an ext event to the client.
2321 2965
2322=cut 2966=cut
2323 2967
2324sub cf::client::ext_event($$%) { 2968sub cf::client::ext_msg($$@) {
2325 my ($self, $type, %msg) = @_; 2969 my ($self, $type, @msg) = @_;
2326 2970
2971 if ($self->extcmd == 2) {
2972 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2973 } elsif ($self->extcmd == 1) { # TODO: remove
2327 $msg{msgtype} = "event_$type"; 2974 push @msg, msgtype => "event_$type";
2328 $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 }
2329} 2995}
2330 2996
2331=item $success = $client->query ($flags, "text", \&cb) 2997=item $success = $client->query ($flags, "text", \&cb)
2332 2998
2333Queues a query to the client, calling the given callback with 2999Queues a query to the client, calling the given callback with
2334the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 3000the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 3001C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336 3002
2337Queries can fail, so check the return code. Or don't, as queries will become 3003Queries can fail, so check the return code. Or don't, as queries will
2338reliable at some point in the future. 3004become reliable at some point in the future.
2339 3005
2340=cut 3006=cut
2341 3007
2342sub cf::client::query { 3008sub cf::client::query {
2343 my ($self, $flags, $text, $cb) = @_; 3009 my ($self, $flags, $text, $cb) = @_;
… …
2351 utf8::encode $text; 3017 utf8::encode $text;
2352 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 3018 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353 3019
2354 $self->send_packet ($self->{query_queue}[0][0]) 3020 $self->send_packet ($self->{query_queue}[0][0])
2355 if @{ $self->{query_queue} } == 1; 3021 if @{ $self->{query_queue} } == 1;
3022
3023 1
2356} 3024}
2357 3025
2358cf::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 },
2359 on_reply => sub { 3032 on_reply => sub {
2360 my ($ns, $msg) = @_; 3033 my ($ns, $msg) = @_;
2361 3034
2362 # this weird shuffling is so that direct followup queries 3035 # this weird shuffling is so that direct followup queries
2363 # get handled first 3036 # get handled first
… …
2375 } else { 3048 } else {
2376 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3049 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377 } 3050 }
2378 } 3051 }
2379 }, 3052 },
3053 on_exticmd => sub {
3054 my ($ns, $buf) = @_;
3055
3056 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3057
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
3066 if (my $cb = $EXTICMD{$type}) {
3067 @reply = $cb->($ns, @payload);
3068 }
3069
3070 $ns->ext_reply ($reply, @reply)
3071 if $reply;
3072
3073 } else {
3074 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3075 }
3076
3077 cf::override;
3078 },
2380); 3079);
2381 3080
2382=item $client->async (\&cb) 3081=item $client->async (\&cb)
2383 3082
2384Create a new coroutine, running the specified callback. The coroutine will 3083Create a new coroutine, running the specified callback. The coroutine will
… …
2425our $safe = new Safe "safe"; 3124our $safe = new Safe "safe";
2426our $safe_hole = new Safe::Hole; 3125our $safe_hole = new Safe::Hole;
2427 3126
2428$SIG{FPE} = 'IGNORE'; 3127$SIG{FPE} = 'IGNORE';
2429 3128
2430$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));
2431 3134
2432# here we export the classes and methods available to script code 3135# here we export the classes and methods available to script code
2433 3136
2434=pod 3137=pod
2435 3138
2436The following functions and methods are available within a safe environment: 3139The following functions and methods are available within a safe environment:
2437 3140
2438 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
2439 cf::object::player player 3146 cf::object::player
2440 cf::player peaceful 3147 player
2441 cf::map trigger 3148
3149 cf::player
3150 peaceful
3151
3152 cf::map
3153 trigger
2442 3154
2443=cut 3155=cut
2444 3156
2445for ( 3157for (
2446 ["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)],
2447 ["cf::object::player" => qw(player)], 3161 ["cf::object::player" => qw(player)],
2448 ["cf::player" => qw(peaceful)], 3162 ["cf::player" => qw(peaceful send_msg)],
2449 ["cf::map" => qw(trigger)], 3163 ["cf::map" => qw(trigger)],
2450) { 3164) {
2451 no strict 'refs'; 3165 no strict 'refs';
2452 my ($pkg, @funs) = @$_; 3166 my ($pkg, @funs) = @$_;
2453 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3167 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2470 my ($code, %vars) = @_; 3184 my ($code, %vars) = @_;
2471 3185
2472 my $qcode = $code; 3186 my $qcode = $code;
2473 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3187 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2474 $qcode =~ s/\n/\\n/g; 3188 $qcode =~ s/\n/\\n/g;
3189
3190 %vars = (_dummy => 0) unless %vars;
2475 3191
2476 local $_; 3192 local $_;
2477 local @safe::cf::_safe_eval_args = values %vars; 3193 local @safe::cf::_safe_eval_args = values %vars;
2478 3194
2479 my $eval = 3195 my $eval =
… …
2527# the server's init and main functions 3243# the server's init and main functions
2528 3244
2529sub load_facedata($) { 3245sub load_facedata($) {
2530 my ($path) = @_; 3246 my ($path) = @_;
2531 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
2532 warn "loading facedata from $path\n"; 3254 warn "loading facedata from $path\n";
2533 3255
2534 my $facedata; 3256 my $facedata;
2535 0 < aio_load $path, $facedata 3257 0 < aio_load $path, $facedata
2536 or die "$path: $!"; 3258 or die "$path: $!";
… …
2538 $facedata = Coro::Storable::thaw $facedata; 3260 $facedata = Coro::Storable::thaw $facedata;
2539 3261
2540 $facedata->{version} == 2 3262 $facedata->{version} == 2
2541 or cf::cleanup "$path: version mismatch, cannot proceed."; 3263 or cf::cleanup "$path: version mismatch, cannot proceed.";
2542 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
2543 { 3272 {
2544 my $faces = $facedata->{faceinfo}; 3273 my $faces = $facedata->{faceinfo};
2545 3274
2546 while (my ($face, $info) = each %$faces) { 3275 while (my ($face, $info) = each %$faces) {
2547 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3276 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3277
2548 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3278 cf::face::set_visibility $idx, $info->{visibility};
3279 cf::face::set_magicmap $idx, $info->{magicmap};
2549 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3280 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2550 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3281 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2551 Coro::cede; 3282
3283 cf::cede_to_tick;
2552 } 3284 }
2553 3285
2554 while (my ($face, $info) = each %$faces) { 3286 while (my ($face, $info) = each %$faces) {
2555 next unless $info->{smooth}; 3287 next unless $info->{smooth};
3288
2556 my $idx = cf::face::find $face 3289 my $idx = cf::face::find $face
2557 or next; 3290 or next;
3291
2558 if (my $smooth = cf::face::find $info->{smooth}) { 3292 if (my $smooth = cf::face::find $info->{smooth}) {
3293 cf::face::set_smooth $idx, $smooth;
2559 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3294 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560 } else { 3295 } else {
2561 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3296 warn "smooth face '$info->{smooth}' not found for face '$face'";
2562 } 3297 }
2563 Coro::cede; 3298
3299 cf::cede_to_tick;
2564 } 3300 }
2565 } 3301 }
2566 3302
2567 { 3303 {
2568 my $anims = $facedata->{animinfo}; 3304 my $anims = $facedata->{animinfo};
2569 3305
2570 while (my ($anim, $info) = each %$anims) { 3306 while (my ($anim, $info) = each %$anims) {
2571 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3307 cf::anim::set $anim, $info->{frames}, $info->{facings};
2572 Coro::cede; 3308 cf::cede_to_tick;
2573 } 3309 }
2574 3310
2575 cf::anim::invalidate_all; # d'oh 3311 cf::anim::invalidate_all; # d'oh
2576 } 3312 }
2577 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
2578 1 3349 1
2579} 3350}
2580 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
2581sub 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
2582 load_resource_file "$MAPDIR/regions" 3395 load_resource_file "$MAPDIR/regions"
2583 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 }
2584} 3402}
2585 3403
2586sub reload_facedata { 3404sub reload_facedata {
2587 load_facedata "$DATADIR/facedata" 3405 load_facedata "$DATADIR/facedata"
2588 or die "unable to load facedata\n"; 3406 or die "unable to load facedata\n";
… …
2599} 3417}
2600 3418
2601sub reload_resources { 3419sub reload_resources {
2602 warn "reloading resource files...\n"; 3420 warn "reloading resource files...\n";
2603 3421
3422 reload_facedata;
3423 reload_archetypes;
2604 reload_regions; 3424 reload_regions;
2605 reload_facedata;
2606 #reload_archetypes;#d#
2607 reload_archetypes;
2608 reload_treasures; 3425 reload_treasures;
2609 3426
2610 warn "finished reloading resource files\n"; 3427 warn "finished reloading resource files\n";
2611} 3428}
2612 3429
2613sub init { 3430sub reload_config {
2614 reload_resources; 3431 warn "reloading config file...\n";
2615}
2616 3432
2617sub cfg_load {
2618 open my $fh, "<:utf8", "$CONFDIR/config" 3433 open my $fh, "<:utf8", "$CONFDIR/config"
2619 or return; 3434 or return;
2620 3435
2621 local $/; 3436 local $/;
2622 *CFG = YAML::Syck::Load <$fh>; 3437 *CFG = YAML::XS::Load scalar <$fh>;
2623 3438
2624 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2625 3440
2626 $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};
2627 $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};
… …
2631 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2632 and die "WARNING: m(un)lockall failed: $!\n"; 3447 and die "WARNING: m(un)lockall failed: $!\n";
2633 }; 3448 };
2634 warn $@ if $@; 3449 warn $@ if $@;
2635 } 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;
2636} 3481}
2637 3482
2638sub 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
2639 # we must not ever block the main coroutine 3498 # we must not ever block the main coroutine
2640 local $Coro::idle = sub { 3499 local $Coro::idle = sub {
2641 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#
2642 (async { 3501 (async {
2643 Event::one_event; 3502 $Coro::current->{desc} = "IDLE BUG HANDLER";
3503 EV::loop EV::LOOP_ONESHOT;
2644 })->prio (Coro::PRIO_MAX); 3504 })->prio (Coro::PRIO_MAX);
2645 }; 3505 };
2646 3506
2647 cfg_load; 3507 evthread_start IO::AIO::poll_fileno;
3508
3509 cf::sync_job {
3510 reload_resources;
3511 reload_config;
2648 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
2649 load_extensions; 3525 load_extensions;
2650 3526
2651 $TICK_WATCHER->start; 3527 utime time, time, $RUNTIMEFILE;
2652 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;
2653} 3537}
2654 3538
2655############################################################################# 3539#############################################################################
2656# initialisation and cleanup 3540# initialisation and cleanup
2657 3541
2658# install some emergency cleanup handlers 3542# install some emergency cleanup handlers
2659BEGIN { 3543BEGIN {
3544 our %SIGWATCHER = ();
2660 for my $signal (qw(INT HUP TERM)) { 3545 for my $signal (qw(INT HUP TERM)) {
2661 Event->signal ( 3546 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2662 reentrant => 0,
2663 data => WF_AUTOCANCEL,
2664 signal => $signal,
2665 prio => 0,
2666 cb => sub {
2667 cf::cleanup "SIG$signal"; 3547 cf::cleanup "SIG$signal";
2668 },
2669 ); 3548 };
2670 } 3549 }
2671} 3550}
2672 3551
2673sub write_runtime { 3552sub write_runtime_sync {
2674 my $runtime = "$LOCALDIR/runtime";
2675
2676 # first touch the runtime file to show we are still running: 3553 # first touch the runtime file to show we are still running:
2677 # the fsync below can take a very very long time. 3554 # the fsync below can take a very very long time.
2678 3555
2679 IO::AIO::aio_utime $runtime, undef, undef; 3556 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2680 3557
2681 my $guard = cf::lock_acquire "write_runtime"; 3558 my $guard = cf::lock_acquire "write_runtime";
2682 3559
2683 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3560 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2684 or return; 3561 or return;
2685 3562
2686 my $value = $cf::RUNTIME + 90 + 10; 3563 my $value = $cf::RUNTIME + 90 + 10;
2687 # 10 is the runtime save interval, for a monotonic clock 3564 # 10 is the runtime save interval, for a monotonic clock
2688 # 60 allows for the watchdog to kill the server. 3565 # 60 allows for the watchdog to kill the server.
… …
2698 aio_utime $fh, undef, undef; 3575 aio_utime $fh, undef, undef;
2699 3576
2700 close $fh 3577 close $fh
2701 or return; 3578 or return;
2702 3579
2703 aio_rename "$runtime~", $runtime 3580 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2704 and return; 3581 and return;
2705 3582
2706 warn "runtime file written.\n"; 3583 warn "runtime file written.\n";
2707 3584
2708 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 };
2709} 3636}
2710 3637
2711sub emergency_save() { 3638sub emergency_save() {
2712 my $freeze_guard = cf::freeze_mainloop; 3639 my $freeze_guard = cf::freeze_mainloop;
2713 3640
2714 warn "enter emergency perl save\n"; 3641 warn "emergency_perl_save: enter\n";
2715 3642
2716 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
2717 # use a peculiar iteration method to avoid tripping on perl 3649 # use a peculiar iteration method to avoid tripping on perl
2718 # refcount bugs in for. also avoids problems with players 3650 # refcount bugs in for. also avoids problems with players
2719 # and maps saved/destroyed asynchronously. 3651 # and maps saved/destroyed asynchronously.
2720 warn "begin emergency player save\n"; 3652 warn "emergency_perl_save: begin player save\n";
2721 for my $login (keys %cf::PLAYER) { 3653 for my $login (keys %cf::PLAYER) {
2722 my $pl = $cf::PLAYER{$login} or next; 3654 my $pl = $cf::PLAYER{$login} or next;
2723 $pl->valid or next; 3655 $pl->valid or next;
3656 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2724 $pl->save; 3657 $pl->save;
2725 } 3658 }
2726 warn "end emergency player save\n"; 3659 warn "emergency_perl_save: end player save\n";
2727 3660
2728 warn "begin emergency map save\n"; 3661 warn "emergency_perl_save: begin map save\n";
2729 for my $path (keys %cf::MAP) { 3662 for my $path (keys %cf::MAP) {
2730 my $map = $cf::MAP{$path} or next; 3663 my $map = $cf::MAP{$path} or next;
2731 $map->valid or next; 3664 $map->valid or next;
2732 $map->save; 3665 $map->save;
2733 } 3666 }
2734 warn "end emergency map save\n"; 3667 warn "emergency_perl_save: end map save\n";
2735 3668
2736 warn "begin emergency database checkpoint\n"; 3669 warn "emergency_perl_save: begin database checkpoint\n";
2737 BDB::db_env_txn_checkpoint $DB_ENV; 3670 BDB::db_env_txn_checkpoint $DB_ENV;
2738 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";
2739 }; 3676 };
2740 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
2741 warn "leave emergency perl save\n"; 3683 warn "emergency_perl_save: leave\n";
2742} 3684}
2743 3685
2744sub post_cleanup { 3686sub post_cleanup {
2745 my ($make_core) = @_; 3687 my ($make_core) = @_;
2746 3688
2747 warn Carp::longmess "post_cleanup backtrace" 3689 warn Carp::longmess "post_cleanup backtrace"
2748 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#
2749} 3720}
2750 3721
2751sub do_reload_perl() { 3722sub do_reload_perl() {
2752 # can/must only be called in main 3723 # can/must only be called in main
2753 if ($Coro::current != $Coro::main) { 3724 if ($Coro::current != $Coro::main) {
2754 warn "can only reload from main coroutine"; 3725 warn "can only reload from main coroutine";
2755 return; 3726 return;
2756 } 3727 }
2757 3728
3729 return if $RELOAD++;
3730
3731 my $t1 = EV::time;
3732
3733 while ($RELOAD) {
2758 warn "reloading..."; 3734 warn "reloading...";
2759 3735
2760 warn "entering sync_job"; 3736 warn "entering sync_job";
2761 3737
2762 cf::sync_job { 3738 cf::sync_job {
2763 cf::write_runtime; # external watchdog should not bark 3739 cf::write_runtime_sync; # external watchdog should not bark
2764 cf::emergency_save; 3740 cf::emergency_save;
2765 cf::write_runtime; # external watchdog should not bark 3741 cf::write_runtime_sync; # external watchdog should not bark
2766 3742
2767 warn "syncing database to disk"; 3743 warn "syncing database to disk";
2768 BDB::db_env_txn_checkpoint $DB_ENV; 3744 BDB::db_env_txn_checkpoint $DB_ENV;
2769 3745
2770 # 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
2771 3747
2772 warn "cancelling all WF_AUTOCANCEL watchers";
2773 for (Event::all_watchers) {
2774 $_->cancel if $_->data & WF_AUTOCANCEL;
2775 }
2776
2777 warn "flushing outstanding aio requests"; 3748 warn "flushing outstanding aio requests";
2778 for (;;) {
2779 BDB::flush;
2780 IO::AIO::flush;
2781 Coro::cede;
2782 last unless IO::AIO::nreqs || BDB::nreqs; 3749 while (IO::AIO::nreqs || BDB::nreqs) {
2783 warn "iterate..."; 3750 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2784 }
2785
2786 ++$RELOAD;
2787
2788 warn "cancelling all extension coros";
2789 $_->cancel for values %EXT_CORO;
2790 %EXT_CORO = ();
2791
2792 warn "removing commands";
2793 %COMMAND = ();
2794
2795 warn "removing ext commands";
2796 %EXTCMD = ();
2797
2798 warn "unloading/nuking all extensions";
2799 for my $pkg (@EXTS) {
2800 warn "... unloading $pkg";
2801
2802 if (my $cb = $pkg->can ("unload")) {
2803 eval {
2804 $cb->($pkg);
2805 1
2806 } or warn "$pkg unloaded, but with errors: $@";
2807 } 3751 }
2808 3752
2809 warn "... nuking $pkg"; 3753 warn "cancelling all extension coros";
2810 Symbol::delete_package $pkg; 3754 $_->cancel for values %EXT_CORO;
2811 } 3755 %EXT_CORO = ();
2812 3756
2813 warn "unloading all perl modules loaded from $LIBDIR"; 3757 warn "removing commands";
2814 while (my ($k, $v) = each %INC) { 3758 %COMMAND = ();
2815 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2816 3759
3760 warn "removing ext/exti commands";
3761 %EXTCMD = ();
3762 %EXTICMD = ();
3763
3764 warn "unloading/nuking all extensions";
3765 for my $pkg (@EXTS) {
2817 warn "... unloading $k"; 3766 warn "... unloading $pkg";
2818 delete $INC{$k};
2819 3767
2820 $k =~ s/\.pm$//;
2821 $k =~ s/\//::/g;
2822
2823 if (my $cb = $k->can ("unload_module")) { 3768 if (my $cb = $pkg->can ("unload")) {
3769 eval {
2824 $cb->(); 3770 $cb->($pkg);
3771 1
3772 } or warn "$pkg unloaded, but with errors: $@";
3773 }
3774
3775 warn "... clearing $pkg";
3776 clear_package $pkg;
2825 } 3777 }
2826 3778
2827 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;
2828 } 3794 }
2829 3795
2830 warn "getting rid of safe::, as good as possible"; 3796 warn "getting rid of safe::, as good as possible";
2831 Symbol::delete_package "safe::$_" 3797 clear_package "safe::$_"
2832 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);
2833 3799
2834 warn "unloading cf.pm \"a bit\""; 3800 warn "unloading cf.pm \"a bit\"";
2835 delete $INC{"cf.pm"}; 3801 delete $INC{"cf.pm"};
2836 delete $INC{"cf/pod.pm"}; 3802 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2837 3803
2838 # don't, removes xs symbols, too, 3804 # don't, removes xs symbols, too,
2839 # and global variables created in xs 3805 # and global variables created in xs
2840 #Symbol::delete_package __PACKAGE__; 3806 #clear_package __PACKAGE__;
2841 3807
2842 warn "unload completed, starting to reload now"; 3808 warn "unload completed, starting to reload now";
2843 3809
2844 warn "reloading cf.pm"; 3810 warn "reloading cf.pm";
2845 require cf; 3811 require cf;
2846 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3812 cf::_connect_to_perl_1;
2847 3813
2848 warn "loading config and database again"; 3814 warn "loading config and database again";
2849 cf::cfg_load; 3815 cf::reload_config;
2850 3816
2851 warn "loading extensions"; 3817 warn "loading extensions";
2852 cf::load_extensions; 3818 cf::load_extensions;
2853 3819
3820 if ($REATTACH_ON_RELOAD) {
2854 warn "reattaching attachments to objects/players"; 3821 warn "reattaching attachments to objects/players";
2855 _global_reattach; # objects, sockets 3822 _global_reattach; # objects, sockets
2856 warn "reattaching attachments to maps"; 3823 warn "reattaching attachments to maps";
2857 reattach $_ for values %MAP; 3824 reattach $_ for values %MAP;
2858 warn "reattaching attachments to players"; 3825 warn "reattaching attachments to players";
2859 reattach $_ for values %PLAYER; 3826 reattach $_ for values %PLAYER;
3827 }
2860 3828
3829 warn "running post_init jobs";
3830 (pop @POST_INIT)->(1) while @POST_INIT;
3831
2861 warn "leaving sync_job"; 3832 warn "leaving sync_job";
2862 3833
2863 1 3834 1
2864 } or do { 3835 } or do {
2865 warn $@; 3836 warn $@;
2866 warn "error while reloading, exiting."; 3837 cf::cleanup "error while reloading, exiting.";
2867 exit 1;
2868 }; 3838 };
2869 3839
2870 warn "reloaded"; 3840 warn "reloaded";
3841 --$RELOAD;
3842 }
3843
3844 $t1 = EV::time - $t1;
3845 warn "reload completed in ${t1}s\n";
2871}; 3846};
2872 3847
2873our $RELOAD_WATCHER; # used only during reload 3848our $RELOAD_WATCHER; # used only during reload
2874 3849
2875sub reload_perl() { 3850sub reload_perl() {
2876 # doing reload synchronously and two reloads happen back-to-back, 3851 # doing reload synchronously and two reloads happen back-to-back,
2877 # coro crashes during coro_state_free->destroy here. 3852 # coro crashes during coro_state_free->destroy here.
2878 3853
2879 $RELOAD_WATCHER ||= Event->timer ( 3854 $RELOAD_WATCHER ||= cf::async {
2880 reentrant => 0, 3855 Coro::AIO::aio_wait cache_extensions;
2881 after => 0, 3856
2882 data => WF_AUTOCANCEL, 3857 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
2883 cb => sub {
2884 do_reload_perl; 3858 do_reload_perl;
2885 undef $RELOAD_WATCHER; 3859 undef $RELOAD_WATCHER;
2886 }, 3860 };
2887 ); 3861 };
2888} 3862}
2889 3863
2890register_command "reload" => sub { 3864register_command "reload" => sub {
2891 my ($who, $arg) = @_; 3865 my ($who, $arg) = @_;
2892 3866
2893 if ($who->flag (FLAG_WIZ)) { 3867 if ($who->flag (FLAG_WIZ)) {
2894 $who->message ("reloading server."); 3868 $who->message ("reloading server.");
3869 async {
3870 $Coro::current->{desc} = "perl_reload";
2895 async { reload_perl }; 3871 reload_perl;
3872 };
2896 } 3873 }
2897}; 3874};
2898 3875
2899unshift @INC, $LIBDIR; 3876unshift @INC, $LIBDIR;
2900 3877
… …
2902 3879
2903our @WAIT_FOR_TICK; 3880our @WAIT_FOR_TICK;
2904our @WAIT_FOR_TICK_BEGIN; 3881our @WAIT_FOR_TICK_BEGIN;
2905 3882
2906sub wait_for_tick { 3883sub wait_for_tick {
2907 return unless $TICK_WATCHER->is_active;
2908 return if $Coro::current == $Coro::main; 3884 return if tick_inhibit || $Coro::current == $Coro::main;
2909 3885
2910 my $signal = new Coro::Signal; 3886 my $signal = new Coro::Signal;
2911 push @WAIT_FOR_TICK, $signal; 3887 push @WAIT_FOR_TICK, $signal;
2912 $signal->wait; 3888 $signal->wait;
2913} 3889}
2914 3890
2915sub wait_for_tick_begin { 3891sub wait_for_tick_begin {
2916 return unless $TICK_WATCHER->is_active;
2917 return if $Coro::current == $Coro::main; 3892 return if tick_inhibit || $Coro::current == $Coro::main;
2918 3893
2919 my $signal = new Coro::Signal; 3894 my $signal = new Coro::Signal;
2920 push @WAIT_FOR_TICK_BEGIN, $signal; 3895 push @WAIT_FOR_TICK_BEGIN, $signal;
2921 $signal->wait; 3896 $signal->wait;
2922} 3897}
2923 3898
2924 my $min = 1e6;#d# 3899sub tick {
2925 my $avg = 10;
2926$TICK_WATCHER = Event->timer (
2927 reentrant => 0,
2928 parked => 1,
2929 prio => 0,
2930 at => $NEXT_TICK || $TICK,
2931 data => WF_AUTOCANCEL,
2932 cb => sub {
2933 if ($Coro::current != $Coro::main) { 3900 if ($Coro::current != $Coro::main) {
2934 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"
2935 unless ++$bug_warning > 10; 3902 unless ++$bug_warning > 10;
2936 return; 3903 return;
2937 } 3904 }
2938 3905
2939 $NOW = $tick_start = Event::time;
2940
2941 cf::server_tick; # one server iteration 3906 cf::server_tick; # one server iteration
2942 3907
2943 0 && sync_job {#d# 3908 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2944 for(1..10) { 3909 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2945 my $t = Event::time; 3910 Coro::async_pool {
2946 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3911 $Coro::current->{desc} = "runtime saver";
2947 or die; 3912 write_runtime_sync
2948 3913 or warn "ERROR: unable to write runtime file: $!";
2949 $map->width (50);
2950 $map->height (50);
2951 $map->alloc;
2952 $map->_load_objects ("/tmp/x.map", 1);
2953 my $t = Event::time - $t;
2954
2955 #next unless $t < 0.0013;#d#
2956 if ($t < $min) {
2957 $min = $t;
2958 }
2959 $avg = $avg * 0.99 + $t * 0.01;
2960 }
2961 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2962 exit 0;
2963 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2964 }; 3914 };
3915 }
2965 3916
2966 $RUNTIME += $TICK;
2967 $NEXT_TICK += $TICK;
2968
2969 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2970 $NEXT_RUNTIME_WRITE = $NOW + 10;
2971 Coro::async_pool {
2972 write_runtime
2973 or warn "ERROR: unable to write runtime file: $!";
2974 };
2975 }
2976
2977# my $AFTER = Event::time;
2978# warn $AFTER - $NOW;#d#
2979
2980 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3917 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2981 $sig->send; 3918 $sig->send;
2982 } 3919 }
2983 while (my $sig = shift @WAIT_FOR_TICK) { 3920 while (my $sig = shift @WAIT_FOR_TICK) {
2984 $sig->send; 3921 $sig->send;
2985 } 3922 }
2986 3923
2987 $NOW = Event::time; 3924 $LOAD = ($NOW - $TICK_START) / $TICK;
2988
2989 # if we are delayed by four ticks or more, skip them all
2990 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2991
2992 $TICK_WATCHER->at ($NEXT_TICK);
2993 $TICK_WATCHER->start;
2994
2995 $LOAD = ($NOW - $tick_start) / $TICK;
2996 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3925 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2997 3926
2998 _post_tick; 3927 if (0) {
2999 3928 if ($NEXT_TICK) {
3000 3929 my $jitter = $TICK_START - $NEXT_TICK;
3930 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3931 warn "jitter $JITTER\n";#d#
3932 }
3001 }, 3933 }
3002); 3934}
3003 3935
3004{ 3936{
3005 BDB::max_poll_time $TICK * 0.1; 3937 # configure BDB
3006 $BDB_POLL_WATCHER = Event->io ( 3938
3007 reentrant => 0,
3008 fd => BDB::poll_fileno,
3009 poll => 'r',
3010 prio => 0,
3011 data => WF_AUTOCANCEL,
3012 cb => \&BDB::poll_cb,
3013 );
3014 BDB::min_parallel 8; 3939 BDB::min_parallel 8;
3015 3940 BDB::max_poll_reqs $TICK * 0.1;
3016 BDB::set_sync_prepare { 3941 $AnyEvent::BDB::WATCHER->priority (1);
3017 my $status;
3018 my $current = $Coro::current;
3019 (
3020 sub {
3021 $status = $!;
3022 $current->ready; undef $current;
3023 },
3024 sub {
3025 Coro::schedule while defined $current;
3026 $! = $status;
3027 },
3028 )
3029 };
3030 3942
3031 unless ($DB_ENV) { 3943 unless ($DB_ENV) {
3032 $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);
3033 3950
3034 cf::sync_job { 3951 cf::sync_job {
3035 eval { 3952 eval {
3036 BDB::db_env_open 3953 BDB::db_env_open
3037 $DB_ENV, 3954 $DB_ENV,
… …
3039 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
3040 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3957 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3041 0666; 3958 0666;
3042 3959
3043 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3960 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3044
3045 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3046 $DB_ENV->set_lk_detect;
3047 }; 3961 };
3048 3962
3049 cf::cleanup "db_env_open(db): $@" if $@; 3963 cf::cleanup "db_env_open(db): $@" if $@;
3050 }; 3964 };
3051 } 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 };
3052} 3976}
3053 3977
3054{ 3978{
3979 # configure IO::AIO
3980
3055 IO::AIO::min_parallel 8; 3981 IO::AIO::min_parallel 8;
3056
3057 undef $Coro::AIO::WATCHER;
3058 IO::AIO::max_poll_time $TICK * 0.1; 3982 IO::AIO::max_poll_time $TICK * 0.1;
3059 $AIO_POLL_WATCHER = Event->io ( 3983 undef $AnyEvent::AIO::WATCHER;
3060 reentrant => 0,
3061 data => WF_AUTOCANCEL,
3062 fd => IO::AIO::poll_fileno,
3063 poll => 'r',
3064 prio => 6,
3065 cb => \&IO::AIO::poll_cb,
3066 );
3067} 3984}
3068 3985
3069my $_log_backtrace; 3986my $_log_backtrace;
3070 3987
3071sub _log_backtrace { 3988sub _log_backtrace {
… …
3074 $msg =~ s/\n//; 3991 $msg =~ s/\n//;
3075 3992
3076 # limit the # of concurrent backtraces 3993 # limit the # of concurrent backtraces
3077 if ($_log_backtrace < 2) { 3994 if ($_log_backtrace < 2) {
3078 ++$_log_backtrace; 3995 ++$_log_backtrace;
3996 my $perl_bt = Carp::longmess $msg;
3079 async { 3997 async {
3998 $Coro::current->{desc} = "abt $msg";
3999
3080 my @bt = fork_call { 4000 my @bt = fork_call {
3081 @addr = map { sprintf "%x", $_ } @addr; 4001 @addr = map { sprintf "%x", $_ } @addr;
3082 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4002 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3083 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 |"
3084 or die "addr2line: $!"; 4004 or die "addr2line: $!";
… …
3092 } 4012 }
3093 4013
3094 @funcs 4014 @funcs
3095 }; 4015 };
3096 4016
3097 LOG llevInfo, "[ABT] $msg\n"; 4017 LOG llevInfo, "[ABT] $perl_bt\n";
4018 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3098 LOG llevInfo, "[ABT] $_\n" for @bt; 4019 LOG llevInfo, "[ABT] $_\n" for @bt;
3099 --$_log_backtrace; 4020 --$_log_backtrace;
3100 }; 4021 };
3101 } else { 4022 } else {
3102 LOG llevInfo, "[ABT] $msg\n"; 4023 LOG llevInfo, "[ABT] $msg\n";
3103 LOG llevInfo, "[ABT] [suppressed]\n"; 4024 LOG llevInfo, "[ABT] [suppressed]\n";
3104 } 4025 }
3105} 4026}
3106 4027
3107# load additional modules 4028# load additional modules
3108use cf::pod; 4029require "cf/$_.pm" for @EXTRA_MODULES;
4030cf::_connect_to_perl_2;
3109 4031
3110END { cf::emergency_save } 4032END { cf::emergency_save }
3111 4033
31121 40341
3113 4035

Diff Legend

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