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

Diff Legend

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