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.281 by root, Sat Jun 16 23:22:59 2007 UTC vs.
Revision 1.484 by root, Mon Oct 12 14:00:58 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;
1998
1999=back 2346=back
2000 2347
2001=head3 cf::object 2348=head3 cf::object
2002 2349
2003=cut 2350=cut
… …
2006 2353
2007=over 4 2354=over 4
2008 2355
2009=item $ob->inv_recursive 2356=item $ob->inv_recursive
2010 2357
2011Returns the inventory of the object _and_ their inventories, recursively. 2358Returns the inventory of the object I<and> their inventories, recursively,
2359but I<not> the object itself.
2012 2360
2013=cut 2361=cut
2014 2362
2015sub inv_recursive_; 2363sub inv_recursive_;
2016sub inv_recursive_ { 2364sub inv_recursive_ {
… …
2019 2367
2020sub inv_recursive { 2368sub inv_recursive {
2021 inv_recursive_ inv $_[0] 2369 inv_recursive_ inv $_[0]
2022} 2370}
2023 2371
2372=item $ref = $ob->ref
2373
2374Creates and returns a persistent reference to an object that can be stored as a string.
2375
2376=item $ob = cf::object::deref ($refstring)
2377
2378returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2379even if the object actually exists. May block.
2380
2381=cut
2382
2383sub deref {
2384 my ($ref) = @_;
2385
2386 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2387 my ($uuid, $name) = ($1, $2);
2388 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2389 or return;
2390 $pl->ob->uuid eq $uuid
2391 or return;
2392
2393 $pl->ob
2394 } else {
2395 warn "$ref: cannot resolve object reference\n";
2396 undef
2397 }
2398}
2399
2024package cf; 2400package cf;
2025 2401
2026=back 2402=back
2027 2403
2028=head3 cf::object::player 2404=head3 cf::object::player
… …
2034Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2410Sends 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 2411can be C<undef>. Does the right thing when the player is currently in a
2036dialogue with the given NPC character. 2412dialogue with the given NPC character.
2037 2413
2038=cut 2414=cut
2415
2416our $SAY_CHANNEL = {
2417 id => "say",
2418 title => "Map",
2419 reply => "say ",
2420 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2421};
2422
2423our $CHAT_CHANNEL = {
2424 id => "chat",
2425 title => "Chat",
2426 reply => "chat ",
2427 tooltip => "Player chat and shouts, global to the server.",
2428};
2039 2429
2040# rough implementation of a future "reply" method that works 2430# rough implementation of a future "reply" method that works
2041# with dialog boxes. 2431# with dialog boxes.
2042#TODO: the first argument must go, split into a $npc->reply_to ( method 2432#TODO: the first argument must go, split into a $npc->reply_to ( method
2043sub cf::object::player::reply($$$;$) { 2433sub cf::object::player::reply($$$;$) {
… …
2045 2435
2046 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2436 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
2047 2437
2048 if ($self->{record_replies}) { 2438 if ($self->{record_replies}) {
2049 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2439 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2440
2050 } else { 2441 } else {
2442 my $pl = $self->contr;
2443
2444 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2445 my $dialog = $pl->{npc_dialog};
2446 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2447
2448 } else {
2051 $msg = $npc->name . " says: $msg" if $npc; 2449 $msg = $npc->name . " says: $msg" if $npc;
2052 $self->message ($msg, $flags); 2450 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2451 }
2053 } 2452 }
2453}
2454
2455=item $object->send_msg ($channel, $msg, $color, [extra...])
2456
2457=cut
2458
2459sub cf::object::send_msg {
2460 my $pl = shift->contr
2461 or return;
2462 $pl->send_msg (@_);
2054} 2463}
2055 2464
2056=item $player_object->may ("access") 2465=item $player_object->may ("access")
2057 2466
2058Returns wether the given player is authorized to access resource "access" 2467Returns wether the given player is authorized to access resource "access"
… …
2071 2480
2072=item $player_object->enter_link 2481=item $player_object->enter_link
2073 2482
2074Freezes the player and moves him/her to a special map (C<{link}>). 2483Freezes the player and moves him/her to a special map (C<{link}>).
2075 2484
2076The player should be reasonably safe there for short amounts of time. You 2485The player should be reasonably safe there for short amounts of time (e.g.
2077I<MUST> call C<leave_link> as soon as possible, though. 2486for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2487though, as the palyer cannot control the character while it is on the link
2488map.
2078 2489
2079Will never block. 2490Will never block.
2080 2491
2081=item $player_object->leave_link ($map, $x, $y) 2492=item $player_object->leave_link ($map, $x, $y)
2082 2493
… …
2137 # use -1 or undef as default coordinates, not 0, 0 2548 # use -1 or undef as default coordinates, not 0, 0
2138 ($x, $y) = ($map->enter_x, $map->enter_y) 2549 ($x, $y) = ($map->enter_x, $map->enter_y)
2139 if $x <=0 && $y <= 0; 2550 if $x <=0 && $y <= 0;
2140 2551
2141 $map->load; 2552 $map->load;
2142 $map->load_diag; 2553 $map->load_neighbours;
2143 2554
2144 return unless $self->contr->active; 2555 return unless $self->contr->active;
2145 $self->activate_recursive;
2146 2556
2147 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2557 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2148 $self->enter_map ($map, $x, $y); 2558 $self->enter_map ($map, $x, $y);
2149}
2150 2559
2560 # only activate afterwards, to support waiting in hooks
2561 $self->activate_recursive;
2562}
2563
2151=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2564=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2152 2565
2153Moves the player to the given map-path and coordinates by first freezing 2566Moves the player to the given map-path and coordinates by first freezing
2154her, loading and preparing them map, calling the provided $check callback 2567her, loading and preparing them map, calling the provided $check callback
2155that has to return the map if sucecssful, and then unfreezes the player on 2568that has to return the map if sucecssful, and then unfreezes the player on
2156the new (success) or old (failed) map position. 2569the new (success) or old (failed) map position. In either case, $done will
2570be called at the end of this process.
2571
2572Note that $check will be called with a potentially non-loaded map, so if
2573it needs a loaded map it has to call C<< ->load >>.
2157 2574
2158=cut 2575=cut
2159 2576
2160our $GOTOGEN; 2577our $GOTOGEN;
2161 2578
2162sub cf::object::player::goto { 2579sub cf::object::player::goto {
2163 my ($self, $path, $x, $y, $check) = @_; 2580 my ($self, $path, $x, $y, $check, $done) = @_;
2164 2581
2165 # do generation counting so two concurrent goto's will be executed in-order 2582 # do generation counting so two concurrent goto's will be executed in-order
2166 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2583 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2167 2584
2168 $self->enter_link; 2585 $self->enter_link;
2169 2586
2170 (async { 2587 (async {
2588 $Coro::current->{desc} = "player::goto $path $x $y";
2589
2590 # *tag paths override both path and x|y
2591 if ($path =~ /^\*(.*)$/) {
2592 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2593 my $ob = $obs[rand @obs];
2594
2595 # see if we actually can go there
2596 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2597 $ob = $obs[rand @obs];
2598 } else {
2599 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2600 }
2601 # else put us there anyways for now #d#
2602
2603 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2604 } else {
2605 ($path, $x, $y) = (undef, undef, undef);
2606 }
2607 }
2608
2171 my $map = eval { 2609 my $map = eval {
2172 my $map = cf::map::find $path; 2610 my $map = defined $path ? cf::map::find $path : undef;
2173 2611
2174 if ($map) { 2612 if ($map) {
2175 $map = $map->customise_for ($self); 2613 $map = $map->customise_for ($self);
2176 $map = $check->($map) if $check && $map; 2614 $map = $check->($map) if $check && $map;
2177 } else { 2615 } else {
2178 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2616 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2179 } 2617 }
2180 2618
2181 $map 2619 $map
2182 }; 2620 };
2183 2621
… …
2188 2626
2189 if ($gen == $self->{_goto_generation}) { 2627 if ($gen == $self->{_goto_generation}) {
2190 delete $self->{_goto_generation}; 2628 delete $self->{_goto_generation};
2191 $self->leave_link ($map, $x, $y); 2629 $self->leave_link ($map, $x, $y);
2192 } 2630 }
2631
2632 $done->() if $done;
2193 })->prio (1); 2633 })->prio (1);
2194} 2634}
2195 2635
2196=item $player_object->enter_exit ($exit_object) 2636=item $player_object->enter_exit ($exit_object)
2197 2637
… …
2217} 2657}
2218 2658
2219sub prepare_random_map { 2659sub prepare_random_map {
2220 my ($exit) = @_; 2660 my ($exit) = @_;
2221 2661
2222 my $guard = cf::lock_acquire "exit_prepare:$exit";
2223
2224 # all this does is basically replace the /! path by 2662 # all this does is basically replace the /! path by
2225 # a new random map path (?random/...) with a seed 2663 # a new random map path (?random/...) with a seed
2226 # that depends on the exit object 2664 # that depends on the exit object
2227 2665
2228 my $rmp = parse_random_map_params $exit->msg; 2666 my $rmp = parse_random_map_params $exit->msg;
… …
2230 if ($exit->map) { 2668 if ($exit->map) {
2231 $rmp->{region} = $exit->region->name; 2669 $rmp->{region} = $exit->region->name;
2232 $rmp->{origin_map} = $exit->map->path; 2670 $rmp->{origin_map} = $exit->map->path;
2233 $rmp->{origin_x} = $exit->x; 2671 $rmp->{origin_x} = $exit->x;
2234 $rmp->{origin_y} = $exit->y; 2672 $rmp->{origin_y} = $exit->y;
2673
2674 $exit->map->touch;
2235 } 2675 }
2236 2676
2237 $rmp->{random_seed} ||= $exit->random_seed; 2677 $rmp->{random_seed} ||= $exit->random_seed;
2238 2678
2239 my $data = cf::to_json $rmp; 2679 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2240 my $md5 = Digest::MD5::md5_hex $data; 2680 my $md5 = Digest::MD5::md5_hex $data;
2241 my $meta = "$RANDOMDIR/$md5.meta"; 2681 my $meta = "$RANDOMDIR/$md5.meta";
2242 2682
2243 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2683 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2244 aio_write $fh, 0, (length $data), $data, 0; 2684 aio_write $fh, 0, (length $data), $data, 0;
2245 undef $fh; 2685 undef $fh;
2246 aio_rename "$meta~", $meta; 2686 aio_rename "$meta~", $meta;
2247 2687
2688 my $slaying = "?random/$md5";
2689
2690 if ($exit->valid) {
2248 $exit->slaying ("?random/$md5"); 2691 $exit->slaying ("?random/$md5");
2249 $exit->msg (undef); 2692 $exit->msg (undef);
2693 }
2250 } 2694 }
2251} 2695}
2252 2696
2253sub cf::object::player::enter_exit { 2697sub cf::object::player::enter_exit {
2254 my ($self, $exit) = @_; 2698 my ($self, $exit) = @_;
2255 2699
2256 return unless $self->type == cf::PLAYER; 2700 return unless $self->type == cf::PLAYER;
2257 2701
2258 if ($exit->slaying eq "/!") {
2259 #TODO: this should de-fi-ni-te-ly not be a sync-job
2260 # the problem is that $exit might not survive long enough
2261 # so it needs to be done right now, right here
2262 cf::sync_job { prepare_random_map $exit };
2263 }
2264
2265 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2266 my $hp = $exit->stats->hp;
2267 my $sp = $exit->stats->sp;
2268
2269 $self->enter_link; 2702 $self->enter_link;
2270 2703
2271 (async { 2704 (async {
2272 $self->deactivate_recursive; # just to be sure 2705 $Coro::current->{desc} = "enter_exit";
2706
2273 unless (eval { 2707 unless (eval {
2708 $self->deactivate_recursive; # just to be sure
2709
2710 # random map handling
2711 {
2712 my $guard = cf::lock_acquire "exit_prepare:$exit";
2713
2714 prepare_random_map $exit
2715 if $exit->slaying eq "/!";
2716 }
2717
2718 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2719 my $x = $exit->stats->hp;
2720 my $y = $exit->stats->sp;
2721
2274 $self->goto ($slaying, $hp, $sp); 2722 $self->goto ($map, $x, $y);
2275 2723
2724 # if exit is damned, update players death & WoR home-position
2725 $self->contr->savebed ($map, $x, $y)
2726 if $exit->flag (cf::FLAG_DAMNED);
2727
2276 1; 2728 1
2277 }) { 2729 }) {
2278 $self->message ("Something went wrong deep within the crossfire server. " 2730 $self->message ("Something went wrong deep within the deliantra server. "
2279 . "I'll try to bring you back to the map you were before. " 2731 . "I'll try to bring you back to the map you were before. "
2280 . "Please report this to the dungeon master!", 2732 . "Please report this to the dungeon master!",
2281 cf::NDI_UNIQUE | cf::NDI_RED); 2733 cf::NDI_UNIQUE | cf::NDI_RED);
2282 2734
2283 warn "ERROR in enter_exit: $@"; 2735 warn "ERROR in enter_exit: $@";
… …
2302 2754
2303 utf8::encode $text; 2755 utf8::encode $text;
2304 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2756 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2305} 2757}
2306 2758
2759=item $client->send_msg ($channel, $msg, $color, [extra...])
2760
2761Send a drawinfo or msg packet to the client, formatting the msg for the
2762client if neccessary. C<$type> should be a string identifying the type of
2763the message, with C<log> being the default. If C<$color> is negative, suppress
2764the message unless the client supports the msg packet.
2765
2766=cut
2767
2768# non-persistent channels (usually the info channel)
2769our %CHANNEL = (
2770 "c/identify" => {
2771 id => "infobox",
2772 title => "Identify",
2773 reply => undef,
2774 tooltip => "Items recently identified",
2775 },
2776 "c/examine" => {
2777 id => "infobox",
2778 title => "Examine",
2779 reply => undef,
2780 tooltip => "Signs and other items you examined",
2781 },
2782 "c/book" => {
2783 id => "infobox",
2784 title => "Book",
2785 reply => undef,
2786 tooltip => "The contents of a note or book",
2787 },
2788 "c/lookat" => {
2789 id => "infobox",
2790 title => "Look",
2791 reply => undef,
2792 tooltip => "What you saw there",
2793 },
2794 "c/who" => {
2795 id => "infobox",
2796 title => "Players",
2797 reply => undef,
2798 tooltip => "Shows players who are currently online",
2799 },
2800 "c/body" => {
2801 id => "infobox",
2802 title => "Body Parts",
2803 reply => undef,
2804 tooltip => "Shows which body parts you posess and are available",
2805 },
2806 "c/statistics" => {
2807 id => "infobox",
2808 title => "Statistics",
2809 reply => undef,
2810 tooltip => "Shows your primary statistics",
2811 },
2812 "c/skills" => {
2813 id => "infobox",
2814 title => "Skills",
2815 reply => undef,
2816 tooltip => "Shows your experience per skill and item power",
2817 },
2818 "c/shopitems" => {
2819 id => "infobox",
2820 title => "Shop Items",
2821 reply => undef,
2822 tooltip => "Shows the items currently for sale in this shop",
2823 },
2824 "c/resistances" => {
2825 id => "infobox",
2826 title => "Resistances",
2827 reply => undef,
2828 tooltip => "Shows your resistances",
2829 },
2830 "c/pets" => {
2831 id => "infobox",
2832 title => "Pets",
2833 reply => undef,
2834 tooltip => "Shows information abotu your pets/a specific pet",
2835 },
2836 "c/perceiveself" => {
2837 id => "infobox",
2838 title => "Perceive Self",
2839 reply => undef,
2840 tooltip => "You gained detailed knowledge about yourself",
2841 },
2842 "c/uptime" => {
2843 id => "infobox",
2844 title => "Uptime",
2845 reply => undef,
2846 tooltip => "How long the server has been running since last restart",
2847 },
2848 "c/mapinfo" => {
2849 id => "infobox",
2850 title => "Map Info",
2851 reply => undef,
2852 tooltip => "Information related to the maps",
2853 },
2854 "c/party" => {
2855 id => "party",
2856 title => "Party",
2857 reply => "gsay ",
2858 tooltip => "Messages and chat related to your party",
2859 },
2860 "c/death" => {
2861 id => "death",
2862 title => "Death",
2863 reply => undef,
2864 tooltip => "Reason for and more info about your most recent death",
2865 },
2866 "c/say" => $SAY_CHANNEL,
2867 "c/chat" => $CHAT_CHANNEL,
2868);
2869
2870sub cf::client::send_msg {
2871 my ($self, $channel, $msg, $color, @extra) = @_;
2872
2873 $msg = $self->pl->expand_cfpod ($msg)
2874 unless $color & cf::NDI_VERBATIM;
2875
2876 $color &= cf::NDI_CLIENT_MASK; # just in case...
2877
2878 # check predefined channels, for the benefit of C
2879 if ($CHANNEL{$channel}) {
2880 $channel = $CHANNEL{$channel};
2881
2882 $self->ext_msg (channel_info => $channel);
2883 $channel = $channel->{id};
2884
2885 } elsif (ref $channel) {
2886 # send meta info to client, if not yet sent
2887 unless (exists $self->{channel}{$channel->{id}}) {
2888 $self->{channel}{$channel->{id}} = $channel;
2889 $self->ext_msg (channel_info => $channel);
2890 }
2891
2892 $channel = $channel->{id};
2893 }
2894
2895 return unless @extra || length $msg;
2896
2897 # default colour, mask it out
2898 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2899 if $color & cf::NDI_DEF;
2900
2901 my $pkt = "msg "
2902 . $self->{json_coder}->encode (
2903 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2904 );
2905
2906 # try lzf for large packets
2907 $pkt = "lzf " . Compress::LZF::compress $pkt
2908 if 1024 <= length $pkt and $self->{can_lzf};
2909
2910 # split very large packets
2911 if (8192 < length $pkt and $self->{can_lzf}) {
2912 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2913 $pkt = "frag";
2914 }
2915
2916 $self->send_packet ($pkt);
2917}
2918
2307=item $client->ext_event ($type, %msg) 2919=item $client->ext_msg ($type, @msg)
2308 2920
2309Sends an exti event to the client. 2921Sends an ext event to the client.
2310 2922
2311=cut 2923=cut
2312 2924
2313sub cf::client::ext_event($$%) { 2925sub cf::client::ext_msg($$@) {
2314 my ($self, $type, %msg) = @_; 2926 my ($self, $type, @msg) = @_;
2315 2927
2928 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2930 } elsif ($self->extcmd == 1) { # TODO: remove
2316 $msg{msgtype} = "event_$type"; 2931 push @msg, msgtype => "event_$type";
2317 $self->send_packet ("ext " . cf::to_json \%msg); 2932 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933 }
2934}
2935
2936=item $client->ext_reply ($msgid, @msg)
2937
2938Sends an ext reply to the client.
2939
2940=cut
2941
2942sub cf::client::ext_reply($$@) {
2943 my ($self, $id, @msg) = @_;
2944
2945 if ($self->extcmd == 2) {
2946 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2947 } elsif ($self->extcmd == 1) {
2948 #TODO: version 1, remove
2949 unshift @msg, msgtype => "reply", msgid => $id;
2950 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2951 }
2318} 2952}
2319 2953
2320=item $success = $client->query ($flags, "text", \&cb) 2954=item $success = $client->query ($flags, "text", \&cb)
2321 2955
2322Queues a query to the client, calling the given callback with 2956Queues a query to the client, calling the given callback with
2323the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2957the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2324C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2958C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2325 2959
2326Queries can fail, so check the return code. Or don't, as queries will become 2960Queries can fail, so check the return code. Or don't, as queries will
2327reliable at some point in the future. 2961become reliable at some point in the future.
2328 2962
2329=cut 2963=cut
2330 2964
2331sub cf::client::query { 2965sub cf::client::query {
2332 my ($self, $flags, $text, $cb) = @_; 2966 my ($self, $flags, $text, $cb) = @_;
… …
2340 utf8::encode $text; 2974 utf8::encode $text;
2341 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2975 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2342 2976
2343 $self->send_packet ($self->{query_queue}[0][0]) 2977 $self->send_packet ($self->{query_queue}[0][0])
2344 if @{ $self->{query_queue} } == 1; 2978 if @{ $self->{query_queue} } == 1;
2979
2980 1
2345} 2981}
2346 2982
2347cf::client->attach ( 2983cf::client->attach (
2984 on_connect => sub {
2985 my ($ns) = @_;
2986
2987 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2988 },
2348 on_reply => sub { 2989 on_reply => sub {
2349 my ($ns, $msg) = @_; 2990 my ($ns, $msg) = @_;
2350 2991
2351 # this weird shuffling is so that direct followup queries 2992 # this weird shuffling is so that direct followup queries
2352 # get handled first 2993 # get handled first
… …
2364 } else { 3005 } else {
2365 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3006 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2366 } 3007 }
2367 } 3008 }
2368 }, 3009 },
3010 on_exticmd => sub {
3011 my ($ns, $buf) = @_;
3012
3013 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3014
3015 if (ref $msg) {
3016 my ($type, $reply, @payload) =
3017 "ARRAY" eq ref $msg
3018 ? @$msg
3019 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3020
3021 my @reply;
3022
3023 if (my $cb = $EXTICMD{$type}) {
3024 @reply = $cb->($ns, @payload);
3025 }
3026
3027 $ns->ext_reply ($reply, @reply)
3028 if $reply;
3029
3030 } else {
3031 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3032 }
3033
3034 cf::override;
3035 },
2369); 3036);
2370 3037
2371=item $client->async (\&cb) 3038=item $client->async (\&cb)
2372 3039
2373Create a new coroutine, running the specified callback. The coroutine will 3040Create a new coroutine, running the specified callback. The coroutine will
… …
2414our $safe = new Safe "safe"; 3081our $safe = new Safe "safe";
2415our $safe_hole = new Safe::Hole; 3082our $safe_hole = new Safe::Hole;
2416 3083
2417$SIG{FPE} = 'IGNORE'; 3084$SIG{FPE} = 'IGNORE';
2418 3085
2419$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3086$safe->permit_only (Opcode::opset qw(
3087 :base_core :base_mem :base_orig :base_math
3088 grepstart grepwhile mapstart mapwhile
3089 sort time
3090));
2420 3091
2421# here we export the classes and methods available to script code 3092# here we export the classes and methods available to script code
2422 3093
2423=pod 3094=pod
2424 3095
2425The following functions and methods are available within a safe environment: 3096The following functions and methods are available within a safe environment:
2426 3097
2427 cf::object contr pay_amount pay_player map 3098 cf::object
3099 contr pay_amount pay_player map x y force_find force_add destroy
3100 insert remove name archname title slaying race decrease split
3101 value
3102
2428 cf::object::player player 3103 cf::object::player
2429 cf::player peaceful 3104 player
2430 cf::map trigger 3105
3106 cf::player
3107 peaceful
3108
3109 cf::map
3110 trigger
2431 3111
2432=cut 3112=cut
2433 3113
2434for ( 3114for (
2435 ["cf::object" => qw(contr pay_amount pay_player map)], 3115 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3116 insert remove inv nrof name archname title slaying race
3117 decrease split destroy change_exp value msg lore send_msg)],
2436 ["cf::object::player" => qw(player)], 3118 ["cf::object::player" => qw(player)],
2437 ["cf::player" => qw(peaceful)], 3119 ["cf::player" => qw(peaceful send_msg)],
2438 ["cf::map" => qw(trigger)], 3120 ["cf::map" => qw(trigger)],
2439) { 3121) {
2440 no strict 'refs'; 3122 no strict 'refs';
2441 my ($pkg, @funs) = @$_; 3123 my ($pkg, @funs) = @$_;
2442 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3124 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2459 my ($code, %vars) = @_; 3141 my ($code, %vars) = @_;
2460 3142
2461 my $qcode = $code; 3143 my $qcode = $code;
2462 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3144 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2463 $qcode =~ s/\n/\\n/g; 3145 $qcode =~ s/\n/\\n/g;
3146
3147 %vars = (_dummy => 0) unless %vars;
2464 3148
2465 local $_; 3149 local $_;
2466 local @safe::cf::_safe_eval_args = values %vars; 3150 local @safe::cf::_safe_eval_args = values %vars;
2467 3151
2468 my $eval = 3152 my $eval =
… …
2516# the server's init and main functions 3200# the server's init and main functions
2517 3201
2518sub load_facedata($) { 3202sub load_facedata($) {
2519 my ($path) = @_; 3203 my ($path) = @_;
2520 3204
3205 # HACK to clear player env face cache, we need some signal framework
3206 # for this (global event?)
3207 %ext::player_env::MUSIC_FACE_CACHE = ();
3208
3209 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3210
2521 warn "loading facedata from $path\n"; 3211 warn "loading facedata from $path\n";
2522 3212
2523 my $facedata; 3213 my $facedata;
2524 0 < aio_load $path, $facedata 3214 0 < aio_load $path, $facedata
2525 or die "$path: $!"; 3215 or die "$path: $!";
… …
2527 $facedata = Coro::Storable::thaw $facedata; 3217 $facedata = Coro::Storable::thaw $facedata;
2528 3218
2529 $facedata->{version} == 2 3219 $facedata->{version} == 2
2530 or cf::cleanup "$path: version mismatch, cannot proceed."; 3220 or cf::cleanup "$path: version mismatch, cannot proceed.";
2531 3221
3222 # patch in the exptable
3223 $facedata->{resource}{"res/exp_table"} = {
3224 type => FT_RSRC,
3225 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3226 };
3227 cf::cede_to_tick;
3228
2532 { 3229 {
2533 my $faces = $facedata->{faceinfo}; 3230 my $faces = $facedata->{faceinfo};
2534 3231
2535 while (my ($face, $info) = each %$faces) { 3232 while (my ($face, $info) = each %$faces) {
2536 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3233 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3234
2537 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3235 cf::face::set_visibility $idx, $info->{visibility};
3236 cf::face::set_magicmap $idx, $info->{magicmap};
2538 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3237 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2539 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3238 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2540 Coro::cede; 3239
3240 cf::cede_to_tick;
2541 } 3241 }
2542 3242
2543 while (my ($face, $info) = each %$faces) { 3243 while (my ($face, $info) = each %$faces) {
2544 next unless $info->{smooth}; 3244 next unless $info->{smooth};
3245
2545 my $idx = cf::face::find $face 3246 my $idx = cf::face::find $face
2546 or next; 3247 or next;
3248
2547 if (my $smooth = cf::face::find $info->{smooth}) { 3249 if (my $smooth = cf::face::find $info->{smooth}) {
3250 cf::face::set_smooth $idx, $smooth;
2548 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3251 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2549 } else { 3252 } else {
2550 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3253 warn "smooth face '$info->{smooth}' not found for face '$face'";
2551 } 3254 }
2552 Coro::cede; 3255
3256 cf::cede_to_tick;
2553 } 3257 }
2554 } 3258 }
2555 3259
2556 { 3260 {
2557 my $anims = $facedata->{animinfo}; 3261 my $anims = $facedata->{animinfo};
2558 3262
2559 while (my ($anim, $info) = each %$anims) { 3263 while (my ($anim, $info) = each %$anims) {
2560 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3264 cf::anim::set $anim, $info->{frames}, $info->{facings};
2561 Coro::cede; 3265 cf::cede_to_tick;
2562 } 3266 }
2563 3267
2564 cf::anim::invalidate_all; # d'oh 3268 cf::anim::invalidate_all; # d'oh
2565 } 3269 }
2566 3270
3271 {
3272 # TODO: for gcfclient pleasure, we should give resources
3273 # that gcfclient doesn't grok a >10000 face index.
3274 my $res = $facedata->{resource};
3275
3276 while (my ($name, $info) = each %$res) {
3277 if (defined $info->{type}) {
3278 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3279 my $data;
3280
3281 if ($info->{type} & 1) {
3282 # prepend meta info
3283
3284 my $meta = $enc->encode ({
3285 name => $name,
3286 %{ $info->{meta} || {} },
3287 });
3288
3289 $data = pack "(w/a*)*", $meta, $info->{data};
3290 } else {
3291 $data = $info->{data};
3292 }
3293
3294 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3295 cf::face::set_type $idx, $info->{type};
3296 } else {
3297 $RESOURCE{$name} = $info;
3298 }
3299
3300 cf::cede_to_tick;
3301 }
3302 }
3303
3304 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3305
2567 1 3306 1
2568} 3307}
2569 3308
3309cf::global->attach (on_resource_update => sub {
3310 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3311 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3312
3313 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3314 my $sound = $soundconf->{compat}[$_]
3315 or next;
3316
3317 my $face = cf::face::find "sound/$sound->[1]";
3318 cf::sound::set $sound->[0] => $face;
3319 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3320 }
3321
3322 while (my ($k, $v) = each %{$soundconf->{event}}) {
3323 my $face = cf::face::find "sound/$v";
3324 cf::sound::set $k => $face;
3325 }
3326 }
3327});
3328
3329register_exticmd fx_want => sub {
3330 my ($ns, $want) = @_;
3331
3332 while (my ($k, $v) = each %$want) {
3333 $ns->fx_want ($k, $v);
3334 }
3335};
3336
3337sub load_resource_file($) {
3338 my $guard = lock_acquire "load_resource_file";
3339
3340 my $status = load_resource_file_ $_[0];
3341 get_slot 0.1, 100;
3342 cf::arch::commit_load;
3343
3344 $status
3345}
3346
2570sub reload_regions { 3347sub reload_regions {
3348 # HACK to clear player env face cache, we need some signal framework
3349 # for this (global event?)
3350 %ext::player_env::MUSIC_FACE_CACHE = ();
3351
2571 load_resource_file "$MAPDIR/regions" 3352 load_resource_file "$MAPDIR/regions"
2572 or die "unable to load regions file\n"; 3353 or die "unable to load regions file\n";
3354
3355 for (cf::region::list) {
3356 $_->{match} = qr/$_->{match}/
3357 if exists $_->{match};
3358 }
2573} 3359}
2574 3360
2575sub reload_facedata { 3361sub reload_facedata {
2576 load_facedata "$DATADIR/facedata" 3362 load_facedata "$DATADIR/facedata"
2577 or die "unable to load facedata\n"; 3363 or die "unable to load facedata\n";
… …
2588} 3374}
2589 3375
2590sub reload_resources { 3376sub reload_resources {
2591 warn "reloading resource files...\n"; 3377 warn "reloading resource files...\n";
2592 3378
3379 reload_facedata;
3380 reload_archetypes;
2593 reload_regions; 3381 reload_regions;
2594 reload_facedata;
2595 #reload_archetypes;#d#
2596 reload_archetypes;
2597 reload_treasures; 3382 reload_treasures;
2598 3383
2599 warn "finished reloading resource files\n"; 3384 warn "finished reloading resource files\n";
2600} 3385}
2601 3386
2602sub init { 3387sub reload_config {
2603 reload_resources;
2604}
2605
2606sub cfg_load {
2607 open my $fh, "<:utf8", "$CONFDIR/config" 3388 open my $fh, "<:utf8", "$CONFDIR/config"
2608 or return; 3389 or return;
2609 3390
2610 local $/; 3391 local $/;
2611 *CFG = YAML::Syck::Load <$fh>; 3392 *CFG = YAML::XS::Load <$fh>;
2612 3393
2613 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3394 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2614 3395
2615 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3396 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2616 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3397 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2622 }; 3403 };
2623 warn $@ if $@; 3404 warn $@ if $@;
2624 } 3405 }
2625} 3406}
2626 3407
3408sub pidfile() {
3409 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3410 or die "$PIDFILE: $!";
3411 flock $fh, &Fcntl::LOCK_EX
3412 or die "$PIDFILE: flock: $!";
3413 $fh
3414}
3415
3416# make sure only one server instance is running at any one time
3417sub atomic {
3418 my $fh = pidfile;
3419
3420 my $pid = <$fh>;
3421 kill 9, $pid if $pid > 0;
3422
3423 seek $fh, 0, 0;
3424 print $fh $$;
3425}
3426
3427sub main_loop {
3428 warn "EV::loop starting\n";
3429 if (1) {
3430 EV::loop;
3431 }
3432 warn "EV::loop returned\n";
3433 goto &main_loop unless $REALLY_UNLOOP;
3434}
3435
2627sub main { 3436sub main {
3437 cf::init_globals; # initialise logging
3438
3439 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3440 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3441 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3442 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3443
3444 cf::init_experience;
3445 cf::init_anim;
3446 cf::init_attackmess;
3447 cf::init_dynamic;
3448
3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3450
2628 # we must not ever block the main coroutine 3451 # we must not ever block the main coroutine
2629 local $Coro::idle = sub { 3452 local $Coro::idle = sub {
2630 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3453 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2631 (async { 3454 (async {
2632 Event::one_event; 3455 $Coro::current->{desc} = "IDLE BUG HANDLER";
3456 EV::loop EV::LOOP_ONESHOT;
2633 })->prio (Coro::PRIO_MAX); 3457 })->prio (Coro::PRIO_MAX);
2634 }; 3458 };
2635 3459
2636 cfg_load; 3460 evthread_start IO::AIO::poll_fileno;
3461
3462 cf::sync_job {
3463 reload_resources;
3464 reload_config;
2637 db_init; 3465 db_init;
3466
3467 cf::load_settings;
3468 cf::load_materials;
3469 cf::init_uuid;
3470 cf::init_signals;
3471 cf::init_commands;
3472 cf::init_skills;
3473
3474 cf::init_beforeplay;
3475
3476 atomic;
3477
2638 load_extensions; 3478 load_extensions;
2639 3479
2640 $TICK_WATCHER->start; 3480 utime time, time, $RUNTIMEFILE;
2641 Event::loop; 3481
3482 # no (long-running) fork's whatsoever before this point(!)
3483 use POSIX ();
3484 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3485
3486 (pop @POST_INIT)->(0) while @POST_INIT;
3487 };
3488
3489 main_loop;
2642} 3490}
2643 3491
2644############################################################################# 3492#############################################################################
2645# initialisation and cleanup 3493# initialisation and cleanup
2646 3494
2647# install some emergency cleanup handlers 3495# install some emergency cleanup handlers
2648BEGIN { 3496BEGIN {
3497 our %SIGWATCHER = ();
2649 for my $signal (qw(INT HUP TERM)) { 3498 for my $signal (qw(INT HUP TERM)) {
2650 Event->signal ( 3499 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2651 reentrant => 0,
2652 data => WF_AUTOCANCEL,
2653 signal => $signal,
2654 prio => 0,
2655 cb => sub {
2656 cf::cleanup "SIG$signal"; 3500 cf::cleanup "SIG$signal";
2657 },
2658 ); 3501 };
2659 } 3502 }
2660} 3503}
2661 3504
2662sub write_runtime { 3505sub write_runtime_sync {
2663 my $runtime = "$LOCALDIR/runtime";
2664
2665 # first touch the runtime file to show we are still running: 3506 # first touch the runtime file to show we are still running:
2666 # the fsync below can take a very very long time. 3507 # the fsync below can take a very very long time.
2667 3508
2668 IO::AIO::aio_utime $runtime, undef, undef; 3509 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2669 3510
2670 my $guard = cf::lock_acquire "write_runtime"; 3511 my $guard = cf::lock_acquire "write_runtime";
2671 3512
2672 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3513 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2673 or return; 3514 or return;
2674 3515
2675 my $value = $cf::RUNTIME + 90 + 10; 3516 my $value = $cf::RUNTIME + 90 + 10;
2676 # 10 is the runtime save interval, for a monotonic clock 3517 # 10 is the runtime save interval, for a monotonic clock
2677 # 60 allows for the watchdog to kill the server. 3518 # 60 allows for the watchdog to kill the server.
… …
2687 aio_utime $fh, undef, undef; 3528 aio_utime $fh, undef, undef;
2688 3529
2689 close $fh 3530 close $fh
2690 or return; 3531 or return;
2691 3532
2692 aio_rename "$runtime~", $runtime 3533 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2693 and return; 3534 and return;
2694 3535
2695 warn "runtime file written.\n"; 3536 warn "runtime file written.\n";
2696 3537
2697 1 3538 1
3539}
3540
3541our $uuid_lock;
3542our $uuid_skip;
3543
3544sub write_uuid_sync($) {
3545 $uuid_skip ||= $_[0];
3546
3547 return if $uuid_lock;
3548 local $uuid_lock = 1;
3549
3550 my $uuid = "$LOCALDIR/uuid";
3551
3552 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3553 or return;
3554
3555 my $value = uuid_seq uuid_cur;
3556
3557 unless ($value) {
3558 warn "cowardly refusing to write zero uuid value!\n";
3559 return;
3560 }
3561
3562 my $value = uuid_str $value + $uuid_skip;
3563 $uuid_skip = 0;
3564
3565 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3566 and return;
3567
3568 # always fsync - this file is important
3569 aio_fsync $fh
3570 and return;
3571
3572 close $fh
3573 or return;
3574
3575 aio_rename "$uuid~", $uuid
3576 and return;
3577
3578 warn "uuid file written ($value).\n";
3579
3580 1
3581
3582}
3583
3584sub write_uuid($$) {
3585 my ($skip, $sync) = @_;
3586
3587 $sync ? write_uuid_sync $skip
3588 : async { write_uuid_sync $skip };
2698} 3589}
2699 3590
2700sub emergency_save() { 3591sub emergency_save() {
2701 my $freeze_guard = cf::freeze_mainloop; 3592 my $freeze_guard = cf::freeze_mainloop;
2702 3593
2703 warn "enter emergency perl save\n"; 3594 warn "emergency_perl_save: enter\n";
2704 3595
2705 cf::sync_job { 3596 cf::sync_job {
3597 # this is a trade-off: we want to be very quick here, so
3598 # save all maps without fsync, and later call a global sync
3599 # (which in turn might be very very slow)
3600 local $USE_FSYNC = 0;
3601
2706 # use a peculiar iteration method to avoid tripping on perl 3602 # use a peculiar iteration method to avoid tripping on perl
2707 # refcount bugs in for. also avoids problems with players 3603 # refcount bugs in for. also avoids problems with players
2708 # and maps saved/destroyed asynchronously. 3604 # and maps saved/destroyed asynchronously.
2709 warn "begin emergency player save\n"; 3605 warn "emergency_perl_save: begin player save\n";
2710 for my $login (keys %cf::PLAYER) { 3606 for my $login (keys %cf::PLAYER) {
2711 my $pl = $cf::PLAYER{$login} or next; 3607 my $pl = $cf::PLAYER{$login} or next;
2712 $pl->valid or next; 3608 $pl->valid or next;
3609 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2713 $pl->save; 3610 $pl->save;
2714 } 3611 }
2715 warn "end emergency player save\n"; 3612 warn "emergency_perl_save: end player save\n";
2716 3613
2717 warn "begin emergency map save\n"; 3614 warn "emergency_perl_save: begin map save\n";
2718 for my $path (keys %cf::MAP) { 3615 for my $path (keys %cf::MAP) {
2719 my $map = $cf::MAP{$path} or next; 3616 my $map = $cf::MAP{$path} or next;
2720 $map->valid or next; 3617 $map->valid or next;
2721 $map->save; 3618 $map->save;
2722 } 3619 }
2723 warn "end emergency map save\n"; 3620 warn "emergency_perl_save: end map save\n";
2724 3621
2725 warn "begin emergency database checkpoint\n"; 3622 warn "emergency_perl_save: begin database checkpoint\n";
2726 BDB::db_env_txn_checkpoint $DB_ENV; 3623 BDB::db_env_txn_checkpoint $DB_ENV;
2727 warn "end emergency database checkpoint\n"; 3624 warn "emergency_perl_save: end database checkpoint\n";
3625
3626 warn "emergency_perl_save: begin write uuid\n";
3627 write_uuid_sync 1;
3628 warn "emergency_perl_save: end write uuid\n";
2728 }; 3629 };
2729 3630
3631 warn "emergency_perl_save: starting sync()\n";
3632 IO::AIO::aio_sync sub {
3633 warn "emergency_perl_save: finished sync()\n";
3634 };
3635
2730 warn "leave emergency perl save\n"; 3636 warn "emergency_perl_save: leave\n";
2731} 3637}
2732 3638
2733sub post_cleanup { 3639sub post_cleanup {
2734 my ($make_core) = @_; 3640 my ($make_core) = @_;
2735 3641
2736 warn Carp::longmess "post_cleanup backtrace" 3642 warn Carp::longmess "post_cleanup backtrace"
2737 if $make_core; 3643 if $make_core;
3644
3645 my $fh = pidfile;
3646 unlink $PIDFILE if <$fh> == $$;
3647}
3648
3649# a safer delete_package, copied from Symbol
3650sub clear_package($) {
3651 my $pkg = shift;
3652
3653 # expand to full symbol table name if needed
3654 unless ($pkg =~ /^main::.*::$/) {
3655 $pkg = "main$pkg" if $pkg =~ /^::/;
3656 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3657 $pkg .= '::' unless $pkg =~ /::$/;
3658 }
3659
3660 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3661 my $stem_symtab = *{$stem}{HASH};
3662
3663 defined $stem_symtab and exists $stem_symtab->{$leaf}
3664 or return;
3665
3666 # clear all symbols
3667 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3668 for my $name (keys %$leaf_symtab) {
3669 _gv_clear *{"$pkg$name"};
3670# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3671 }
3672 warn "cleared package $pkg\n";#d#
2738} 3673}
2739 3674
2740sub do_reload_perl() { 3675sub do_reload_perl() {
2741 # can/must only be called in main 3676 # can/must only be called in main
2742 if ($Coro::current != $Coro::main) { 3677 if ($Coro::current != $Coro::main) {
2743 warn "can only reload from main coroutine"; 3678 warn "can only reload from main coroutine";
2744 return; 3679 return;
2745 } 3680 }
2746 3681
3682 return if $RELOAD++;
3683
3684 my $t1 = EV::time;
3685
3686 while ($RELOAD) {
2747 warn "reloading..."; 3687 warn "reloading...";
2748 3688
2749 warn "entering sync_job"; 3689 warn "entering sync_job";
2750 3690
2751 cf::sync_job { 3691 cf::sync_job {
2752 cf::write_runtime; # external watchdog should not bark 3692 cf::write_runtime_sync; # external watchdog should not bark
2753 cf::emergency_save; 3693 cf::emergency_save;
2754 cf::write_runtime; # external watchdog should not bark 3694 cf::write_runtime_sync; # external watchdog should not bark
2755 3695
2756 warn "syncing database to disk"; 3696 warn "syncing database to disk";
2757 BDB::db_env_txn_checkpoint $DB_ENV; 3697 BDB::db_env_txn_checkpoint $DB_ENV;
2758 3698
2759 # if anything goes wrong in here, we should simply crash as we already saved 3699 # if anything goes wrong in here, we should simply crash as we already saved
2760 3700
2761 warn "cancelling all WF_AUTOCANCEL watchers";
2762 for (Event::all_watchers) {
2763 $_->cancel if $_->data & WF_AUTOCANCEL;
2764 }
2765
2766 warn "flushing outstanding aio requests"; 3701 warn "flushing outstanding aio requests";
2767 for (;;) {
2768 BDB::flush;
2769 IO::AIO::flush;
2770 Coro::cede;
2771 last unless IO::AIO::nreqs || BDB::nreqs; 3702 while (IO::AIO::nreqs || BDB::nreqs) {
2772 warn "iterate..."; 3703 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2773 }
2774
2775 ++$RELOAD;
2776
2777 warn "cancelling all extension coros";
2778 $_->cancel for values %EXT_CORO;
2779 %EXT_CORO = ();
2780
2781 warn "removing commands";
2782 %COMMAND = ();
2783
2784 warn "removing ext commands";
2785 %EXTCMD = ();
2786
2787 warn "unloading/nuking all extensions";
2788 for my $pkg (@EXTS) {
2789 warn "... unloading $pkg";
2790
2791 if (my $cb = $pkg->can ("unload")) {
2792 eval {
2793 $cb->($pkg);
2794 1
2795 } or warn "$pkg unloaded, but with errors: $@";
2796 } 3704 }
2797 3705
2798 warn "... nuking $pkg"; 3706 warn "cancelling all extension coros";
2799 Symbol::delete_package $pkg; 3707 $_->cancel for values %EXT_CORO;
2800 } 3708 %EXT_CORO = ();
2801 3709
2802 warn "unloading all perl modules loaded from $LIBDIR"; 3710 warn "removing commands";
2803 while (my ($k, $v) = each %INC) { 3711 %COMMAND = ();
2804 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2805 3712
3713 warn "removing ext/exti commands";
3714 %EXTCMD = ();
3715 %EXTICMD = ();
3716
3717 warn "unloading/nuking all extensions";
3718 for my $pkg (@EXTS) {
2806 warn "... unloading $k"; 3719 warn "... unloading $pkg";
2807 delete $INC{$k};
2808 3720
2809 $k =~ s/\.pm$//;
2810 $k =~ s/\//::/g;
2811
2812 if (my $cb = $k->can ("unload_module")) { 3721 if (my $cb = $pkg->can ("unload")) {
3722 eval {
2813 $cb->(); 3723 $cb->($pkg);
3724 1
3725 } or warn "$pkg unloaded, but with errors: $@";
3726 }
3727
3728 warn "... clearing $pkg";
3729 clear_package $pkg;
2814 } 3730 }
2815 3731
2816 Symbol::delete_package $k; 3732 warn "unloading all perl modules loaded from $LIBDIR";
3733 while (my ($k, $v) = each %INC) {
3734 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3735
3736 warn "... unloading $k";
3737 delete $INC{$k};
3738
3739 $k =~ s/\.pm$//;
3740 $k =~ s/\//::/g;
3741
3742 if (my $cb = $k->can ("unload_module")) {
3743 $cb->();
3744 }
3745
3746 clear_package $k;
2817 } 3747 }
2818 3748
2819 warn "getting rid of safe::, as good as possible"; 3749 warn "getting rid of safe::, as good as possible";
2820 Symbol::delete_package "safe::$_" 3750 clear_package "safe::$_"
2821 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3751 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2822 3752
2823 warn "unloading cf.pm \"a bit\""; 3753 warn "unloading cf.pm \"a bit\"";
2824 delete $INC{"cf.pm"}; 3754 delete $INC{"cf.pm"};
2825 delete $INC{"cf/pod.pm"}; 3755 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2826 3756
2827 # don't, removes xs symbols, too, 3757 # don't, removes xs symbols, too,
2828 # and global variables created in xs 3758 # and global variables created in xs
2829 #Symbol::delete_package __PACKAGE__; 3759 #clear_package __PACKAGE__;
2830 3760
2831 warn "unload completed, starting to reload now"; 3761 warn "unload completed, starting to reload now";
2832 3762
2833 warn "reloading cf.pm"; 3763 warn "reloading cf.pm";
2834 require cf; 3764 require cf;
2835 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3765 cf::_connect_to_perl_1;
2836 3766
2837 warn "loading config and database again"; 3767 warn "loading config and database again";
2838 cf::cfg_load; 3768 cf::reload_config;
2839 3769
2840 warn "loading extensions"; 3770 warn "loading extensions";
2841 cf::load_extensions; 3771 cf::load_extensions;
2842 3772
3773 if ($REATTACH_ON_RELOAD) {
2843 warn "reattaching attachments to objects/players"; 3774 warn "reattaching attachments to objects/players";
2844 _global_reattach; # objects, sockets 3775 _global_reattach; # objects, sockets
2845 warn "reattaching attachments to maps"; 3776 warn "reattaching attachments to maps";
2846 reattach $_ for values %MAP; 3777 reattach $_ for values %MAP;
2847 warn "reattaching attachments to players"; 3778 warn "reattaching attachments to players";
2848 reattach $_ for values %PLAYER; 3779 reattach $_ for values %PLAYER;
3780 }
2849 3781
3782 warn "running post_init jobs";
3783 (pop @POST_INIT)->(1) while @POST_INIT;
3784
2850 warn "leaving sync_job"; 3785 warn "leaving sync_job";
2851 3786
2852 1 3787 1
2853 } or do { 3788 } or do {
2854 warn $@; 3789 warn $@;
2855 warn "error while reloading, exiting."; 3790 cf::cleanup "error while reloading, exiting.";
2856 exit 1;
2857 }; 3791 };
2858 3792
2859 warn "reloaded"; 3793 warn "reloaded";
3794 --$RELOAD;
3795 }
3796
3797 $t1 = EV::time - $t1;
3798 warn "reload completed in ${t1}s\n";
2860}; 3799};
2861 3800
2862our $RELOAD_WATCHER; # used only during reload 3801our $RELOAD_WATCHER; # used only during reload
2863 3802
2864sub reload_perl() { 3803sub reload_perl() {
2865 # doing reload synchronously and two reloads happen back-to-back, 3804 # doing reload synchronously and two reloads happen back-to-back,
2866 # coro crashes during coro_state_free->destroy here. 3805 # coro crashes during coro_state_free->destroy here.
2867 3806
2868 $RELOAD_WATCHER ||= Event->timer ( 3807 $RELOAD_WATCHER ||= cf::async {
2869 reentrant => 0, 3808 Coro::AIO::aio_wait cache_extensions;
2870 after => 0, 3809
2871 data => WF_AUTOCANCEL, 3810 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
2872 cb => sub {
2873 do_reload_perl; 3811 do_reload_perl;
2874 undef $RELOAD_WATCHER; 3812 undef $RELOAD_WATCHER;
2875 }, 3813 };
2876 ); 3814 };
2877} 3815}
2878 3816
2879register_command "reload" => sub { 3817register_command "reload" => sub {
2880 my ($who, $arg) = @_; 3818 my ($who, $arg) = @_;
2881 3819
2882 if ($who->flag (FLAG_WIZ)) { 3820 if ($who->flag (FLAG_WIZ)) {
2883 $who->message ("reloading server."); 3821 $who->message ("reloading server.");
3822 async {
3823 $Coro::current->{desc} = "perl_reload";
2884 async { reload_perl }; 3824 reload_perl;
3825 };
2885 } 3826 }
2886}; 3827};
2887 3828
2888unshift @INC, $LIBDIR; 3829unshift @INC, $LIBDIR;
2889 3830
… …
2891 3832
2892our @WAIT_FOR_TICK; 3833our @WAIT_FOR_TICK;
2893our @WAIT_FOR_TICK_BEGIN; 3834our @WAIT_FOR_TICK_BEGIN;
2894 3835
2895sub wait_for_tick { 3836sub wait_for_tick {
2896 return unless $TICK_WATCHER->is_active;
2897 return if $Coro::current == $Coro::main; 3837 return if tick_inhibit || $Coro::current == $Coro::main;
2898 3838
2899 my $signal = new Coro::Signal; 3839 my $signal = new Coro::Signal;
2900 push @WAIT_FOR_TICK, $signal; 3840 push @WAIT_FOR_TICK, $signal;
2901 $signal->wait; 3841 $signal->wait;
2902} 3842}
2903 3843
2904sub wait_for_tick_begin { 3844sub wait_for_tick_begin {
2905 return unless $TICK_WATCHER->is_active;
2906 return if $Coro::current == $Coro::main; 3845 return if tick_inhibit || $Coro::current == $Coro::main;
2907 3846
2908 my $signal = new Coro::Signal; 3847 my $signal = new Coro::Signal;
2909 push @WAIT_FOR_TICK_BEGIN, $signal; 3848 push @WAIT_FOR_TICK_BEGIN, $signal;
2910 $signal->wait; 3849 $signal->wait;
2911} 3850}
2912 3851
2913 my $min = 1e6;#d# 3852sub tick {
2914 my $avg = 10;
2915$TICK_WATCHER = Event->timer (
2916 reentrant => 0,
2917 parked => 1,
2918 prio => 0,
2919 at => $NEXT_TICK || $TICK,
2920 data => WF_AUTOCANCEL,
2921 cb => sub {
2922 if ($Coro::current != $Coro::main) { 3853 if ($Coro::current != $Coro::main) {
2923 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3854 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2924 unless ++$bug_warning > 10; 3855 unless ++$bug_warning > 10;
2925 return; 3856 return;
2926 } 3857 }
2927 3858
2928 $NOW = $tick_start = Event::time;
2929
2930 cf::server_tick; # one server iteration 3859 cf::server_tick; # one server iteration
2931 3860
2932 0 && sync_job {#d# 3861 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2933 for(1..10) { 3862 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2934 my $t = Event::time; 3863 Coro::async_pool {
2935 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3864 $Coro::current->{desc} = "runtime saver";
2936 or die; 3865 write_runtime_sync
2937 3866 or warn "ERROR: unable to write runtime file: $!";
2938 $map->width (50);
2939 $map->height (50);
2940 $map->alloc;
2941 $map->_load_objects ("/tmp/x.map", 1);
2942 my $t = Event::time - $t;
2943
2944 #next unless $t < 0.0013;#d#
2945 if ($t < $min) {
2946 $min = $t;
2947 }
2948 $avg = $avg * 0.99 + $t * 0.01;
2949 }
2950 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2951 exit 0;
2952 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2953 }; 3867 };
3868 }
2954 3869
2955 $RUNTIME += $TICK;
2956 $NEXT_TICK += $TICK;
2957
2958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2959 $NEXT_RUNTIME_WRITE = $NOW + 10;
2960 Coro::async_pool {
2961 write_runtime
2962 or warn "ERROR: unable to write runtime file: $!";
2963 };
2964 }
2965
2966# my $AFTER = Event::time;
2967# warn $AFTER - $NOW;#d#
2968
2969 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3870 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2970 $sig->send; 3871 $sig->send;
2971 } 3872 }
2972 while (my $sig = shift @WAIT_FOR_TICK) { 3873 while (my $sig = shift @WAIT_FOR_TICK) {
2973 $sig->send; 3874 $sig->send;
2974 } 3875 }
2975 3876
2976 $NOW = Event::time; 3877 $LOAD = ($NOW - $TICK_START) / $TICK;
2977
2978 # if we are delayed by four ticks or more, skip them all
2979 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2980
2981 $TICK_WATCHER->at ($NEXT_TICK);
2982 $TICK_WATCHER->start;
2983
2984 $LOAD = ($NOW - $tick_start) / $TICK;
2985 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3878 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2986 3879
2987 _post_tick; 3880 if (0) {
2988 3881 if ($NEXT_TICK) {
2989 3882 my $jitter = $TICK_START - $NEXT_TICK;
3883 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3884 warn "jitter $JITTER\n";#d#
3885 }
2990 }, 3886 }
2991); 3887}
2992 3888
2993{ 3889{
2994 BDB::max_poll_time $TICK * 0.1; 3890 # configure BDB
2995 $BDB_POLL_WATCHER = Event->io ( 3891
2996 reentrant => 0,
2997 fd => BDB::poll_fileno,
2998 poll => 'r',
2999 prio => 0,
3000 data => WF_AUTOCANCEL,
3001 cb => \&BDB::poll_cb,
3002 );
3003 BDB::min_parallel 8; 3892 BDB::min_parallel 8;
3004 3893 BDB::max_poll_reqs $TICK * 0.1;
3005 BDB::set_sync_prepare { 3894 $AnyEvent::BDB::WATCHER->priority (1);
3006 my $status;
3007 my $current = $Coro::current;
3008 (
3009 sub {
3010 $status = $!;
3011 $current->ready; undef $current;
3012 },
3013 sub {
3014 Coro::schedule while defined $current;
3015 $! = $status;
3016 },
3017 )
3018 };
3019 3895
3020 unless ($DB_ENV) { 3896 unless ($DB_ENV) {
3021 $DB_ENV = BDB::db_env_create; 3897 $DB_ENV = BDB::db_env_create;
3898 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3899 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3900 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3901 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3902 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3022 3903
3023 cf::sync_job { 3904 cf::sync_job {
3024 eval { 3905 eval {
3025 BDB::db_env_open 3906 BDB::db_env_open
3026 $DB_ENV, 3907 $DB_ENV,
… …
3028 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3909 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3029 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3910 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3030 0666; 3911 0666;
3031 3912
3032 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3913 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3033
3034 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3035 $DB_ENV->set_lk_detect;
3036 }; 3914 };
3037 3915
3038 cf::cleanup "db_env_open(db): $@" if $@; 3916 cf::cleanup "db_env_open(db): $@" if $@;
3039 }; 3917 };
3040 } 3918 }
3919
3920 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3921 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3922 };
3923 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3924 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3925 };
3926 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3927 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3928 };
3041} 3929}
3042 3930
3043{ 3931{
3932 # configure IO::AIO
3933
3044 IO::AIO::min_parallel 8; 3934 IO::AIO::min_parallel 8;
3045
3046 undef $Coro::AIO::WATCHER;
3047 IO::AIO::max_poll_time $TICK * 0.1; 3935 IO::AIO::max_poll_time $TICK * 0.1;
3048 $AIO_POLL_WATCHER = Event->io ( 3936 undef $AnyEvent::AIO::WATCHER;
3049 reentrant => 0,
3050 data => WF_AUTOCANCEL,
3051 fd => IO::AIO::poll_fileno,
3052 poll => 'r',
3053 prio => 6,
3054 cb => \&IO::AIO::poll_cb,
3055 );
3056} 3937}
3057 3938
3058my $_log_backtrace; 3939my $_log_backtrace;
3059 3940
3060sub _log_backtrace { 3941sub _log_backtrace {
… …
3063 $msg =~ s/\n//; 3944 $msg =~ s/\n//;
3064 3945
3065 # limit the # of concurrent backtraces 3946 # limit the # of concurrent backtraces
3066 if ($_log_backtrace < 2) { 3947 if ($_log_backtrace < 2) {
3067 ++$_log_backtrace; 3948 ++$_log_backtrace;
3949 my $perl_bt = Carp::longmess $msg;
3068 async { 3950 async {
3951 $Coro::current->{desc} = "abt $msg";
3952
3069 my @bt = fork_call { 3953 my @bt = fork_call {
3070 @addr = map { sprintf "%x", $_ } @addr; 3954 @addr = map { sprintf "%x", $_ } @addr;
3071 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3955 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3072 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3956 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3073 or die "addr2line: $!"; 3957 or die "addr2line: $!";
… …
3081 } 3965 }
3082 3966
3083 @funcs 3967 @funcs
3084 }; 3968 };
3085 3969
3086 LOG llevInfo, "[ABT] $msg\n"; 3970 LOG llevInfo, "[ABT] $perl_bt\n";
3971 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3087 LOG llevInfo, "[ABT] $_\n" for @bt; 3972 LOG llevInfo, "[ABT] $_\n" for @bt;
3088 --$_log_backtrace; 3973 --$_log_backtrace;
3089 }; 3974 };
3090 } else { 3975 } else {
3091 LOG llevInfo, "[ABT] $msg\n"; 3976 LOG llevInfo, "[ABT] $msg\n";
3092 LOG llevInfo, "[ABT] [suppressed]\n"; 3977 LOG llevInfo, "[ABT] [suppressed]\n";
3093 } 3978 }
3094} 3979}
3095 3980
3096# load additional modules 3981# load additional modules
3097use cf::pod; 3982require "cf/$_.pm" for @EXTRA_MODULES;
3983cf::_connect_to_perl_2;
3098 3984
3099END { cf::emergency_save } 3985END { cf::emergency_save }
3100 3986
31011 39871
3102 3988

Diff Legend

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