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

Diff Legend

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