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.342 by root, Sun Aug 26 15:31:02 2007 UTC vs.
Revision 1.539 by root, Tue May 4 22:49:21 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 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
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.64 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.32 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 75
43$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
44 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 78
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 80
52our %COMMAND = (); 81our %COMMAND = ();
53our %COMMAND_TIME = (); 82our %COMMAND_TIME = ();
56our %EXTCMD = (); 85our %EXTCMD = ();
57our %EXTICMD = (); 86our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 87our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 88our %EXT_MAP = (); # pluggable maps
60 89
61our $RELOAD; # number of reloads so far 90our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 91our @EVENT;
92our @REFLECT; # set by XS
93our %REFLECT; # set by us
63 94
64our $CONFDIR = confdir; 95our $CONFDIR = confdir;
65our $DATADIR = datadir; 96our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 97our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 98our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 99our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 100our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 101our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 102our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 103our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 104our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 105our $BDBDIR = "$LOCALDIR/db";
106our $PIDFILE = "$LOCALDIR/pid";
107our $RUNTIMEFILE = "$LOCALDIR/runtime";
108
109our %RESOURCE; # unused
110
111our $OUTPUT_RATE_MIN = 3000;
112our $OUTPUT_RATE_MAX = 1000000;
113
114our $MAX_LINKS = 32; # how many chained exits to follow
115our $VERBOSE_IO = 1;
75 116
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 117our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 118our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 119our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 120our $USE_FSYNC = 1; # use fsync to write maps - default on
83 121
122our $BDB_DEADLOCK_WATCHER;
123our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 124our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 125our $DB_ENV;
126
127our @EXTRA_MODULES = qw(pod match mapscript);
86 128
87our %CFG; 129our %CFG;
88 130
89our $UPTIME; $UPTIME ||= time; 131our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 132our $RUNTIME;
133our $NOW;
91 134
92our %PLAYER; # all users 135our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 136our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 137our $LINK_MAP; # the special {link} map, which is always available
95 138
96# used to convert map paths into valid unix filenames by replacing / by ∕ 139# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 140our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 141
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 142our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 143our $LOADAVG; # same thing, but with alpha-smoothing
144our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 145our $TICK_START; # for load detecting purposes
146
147our @POST_INIT;
148
149our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
150our $REALLY_UNLOOP; # never set to true, please :)
102 151
103binmode STDOUT; 152binmode STDOUT;
104binmode STDERR; 153binmode STDERR;
105 154
106# read virtual server time, if available 155# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 156unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 157 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 158 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 159 $RUNTIME = <$fh> + 0.;
111} 160}
161
162eval "sub TICK() { $TICK } 1" or die;
112 163
113mkdir $_ 164mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 165 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 166
116our $EMERGENCY_POSITION; 167our $EMERGENCY_POSITION;
117 168
118sub cf::map::normalise; 169sub cf::map::normalise;
170
171sub in_main() {
172 $Coro::current == $Coro::main
173}
174
175#############################################################################
176
177%REFLECT = ();
178for (@REFLECT) {
179 my $reflect = JSON::XS::decode_json $_;
180 $REFLECT{$reflect->{class}} = $reflect;
181}
182
183# this is decidedly evil
184$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
119 185
120############################################################################# 186#############################################################################
121 187
122=head2 GLOBAL VARIABLES 188=head2 GLOBAL VARIABLES
123 189
159 225
160The raw value load value from the last tick. 226The raw value load value from the last tick.
161 227
162=item %cf::CFG 228=item %cf::CFG
163 229
164Configuration for the server, loaded from C</etc/crossfire/config>, or 230Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 231from wherever your confdir points to.
166 232
167=item cf::wait_for_tick, cf::wait_for_tick_begin 233=item cf::wait_for_tick, cf::wait_for_tick_begin
168 234
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 235These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
170returns directly I<after> the tick processing (and consequently, can only wake one process 236returns directly I<after> the tick processing (and consequently, can only wake one process
171per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 237per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172 238
173=item @cf::INVOKE_RESULTS 239=item @cf::INVOKE_RESULTS
174 240
175This array contains the results of the last C<invoke ()> call. When 241This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 242C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call. 243that call.
178 244
245=item %cf::REFLECT
246
247Contains, for each (C++) class name, a hash reference with information
248about object members (methods, scalars, arrays and flags) and other
249metadata, which is useful for introspection.
250
179=back 251=back
180 252
181=cut 253=cut
182 254
183BEGIN { 255sub error(@) { LOG llevError, join "", @_ }
184 *CORE::GLOBAL::warn = sub { 256sub warn (@) { LOG llevWarn , join "", @_ }
257sub info (@) { LOG llevInfo , join "", @_ }
258sub debug(@) { LOG llevDebug, join "", @_ }
259sub trace(@) { LOG llevTrace, join "", @_ }
260
261$Coro::State::WARNHOOK = sub {
185 my $msg = join "", @_; 262 my $msg = join "", @_;
186 263
187 $msg .= "\n" 264 $msg .= "\n"
188 unless $msg =~ /\n$/; 265 unless $msg =~ /\n$/;
189 266
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 267 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 268
192 utf8::encode $msg;
193 LOG llevError, $msg; 269 LOG llevWarn, $msg;
194 }; 270};
195} 271
272$Coro::State::DIEHOOK = sub {
273 return unless $^S eq 0; # "eq", not "=="
274
275 error Carp::longmess $_[0];
276
277 if (in_main) {#d#
278 error "DIEHOOK called in main context, Coro bug?\n";#d#
279 return;#d#
280 }#d#
281
282 # kill coroutine otherwise
283 Coro::terminate
284};
196 285
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 286@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 287@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 288@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 289@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 296for my $pkg (qw(
208 cf::global cf::attachable 297 cf::global cf::attachable
209 cf::object cf::object::player 298 cf::object cf::object::player
210 cf::client cf::player 299 cf::client cf::player
211 cf::arch cf::living 300 cf::arch cf::living
301 cf::map cf::mapspace
212 cf::map cf::party cf::region 302 cf::party cf::region
213)) { 303)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 304 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 305}
217 306
218$Event::DIED = sub { 307$EV::DIED = sub {
219 warn "error in event callback: @_"; 308 Carp::cluck "error in event callback: @_";
220}; 309};
221 310
222############################################################################# 311#############################################################################
223 312
224=head2 UTILITY FUNCTIONS 313=head2 UTILITY FUNCTIONS
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 335 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 336 $d
248 } || "[unable to dump $_[0]: '$@']"; 337 } || "[unable to dump $_[0]: '$@']";
249} 338}
250 339
251=item $ref = cf::from_json $json 340=item $ref = cf::decode_json $json
252 341
253Converts a JSON string into the corresponding perl data structure. 342Converts a JSON string into the corresponding perl data structure.
254 343
255=item $json = cf::to_json $ref 344=item $json = cf::encode_json $ref
256 345
257Converts a perl data structure into its JSON representation. 346Converts a perl data structure into its JSON representation.
258 347
259=cut 348=cut
260 349
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 350our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 351
263sub to_json ($) { $json_coder->encode ($_[0]) } 352sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 353sub decode_json($) { $json_coder->decode ($_[0]) }
354
355=item cf::post_init { BLOCK }
356
357Execute the given codeblock, I<after> all extensions have been (re-)loaded,
358but I<before> the server starts ticking again.
359
360The cdoeblock will have a single boolean argument to indicate whether this
361is a reload or not.
362
363=cut
364
365sub post_init(&) {
366 push @POST_INIT, shift;
367}
265 368
266=item cf::lock_wait $string 369=item cf::lock_wait $string
267 370
268Wait until the given lock is available. See cf::lock_acquire. 371Wait until the given lock is available. See cf::lock_acquire.
269 372
270=item my $lock = cf::lock_acquire $string 373=item my $lock = cf::lock_acquire $string
271 374
272Wait until the given lock is available and then acquires it and returns 375Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 376a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 377for example when the coroutine gets canceled), the lock is automatically
275returned. 378returned.
276 379
380Locks are *not* recursive, locking from the same coro twice results in a
381deadlocked coro.
382
277Lock names should begin with a unique identifier (for example, cf::map::find 383Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 384uses map_find and cf::map::load uses map_load).
279 385
280=item $locked = cf::lock_active $string 386=item $locked = cf::lock_active $string
281 387
282Return true if the lock is currently active, i.e. somebody has locked it. 388Return true if the lock is currently active, i.e. somebody has locked it.
283 389
284=cut 390=cut
285 391
286our %LOCK; 392our $LOCKS = new Coro::SemaphoreSet;
287 393
288sub lock_wait($) { 394sub lock_wait($) {
289 my ($key) = @_; 395 $LOCKS->wait ($_[0]);
290
291 # wait for lock, if any
292 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule;
295 }
296} 396}
297 397
298sub lock_acquire($) { 398sub lock_acquire($) {
299 my ($key) = @_; 399 $LOCKS->guard ($_[0])
300
301 # wait, to be sure we are not locked
302 lock_wait $key;
303
304 $LOCK{$key} = [];
305
306 Coro::guard {
307 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} };
309 }
310} 400}
311 401
312sub lock_active($) { 402sub lock_active($) {
313 my ($key) = @_; 403 $LOCKS->count ($_[0]) < 1
314
315 ! ! $LOCK{$key}
316} 404}
317 405
318sub freeze_mainloop { 406sub freeze_mainloop {
319 return unless $TICK_WATCHER->is_active; 407 tick_inhibit_inc;
320 408
321 my $guard = Coro::guard { 409 &Guard::guard (\&tick_inhibit_dec);
322 $TICK_WATCHER->start; 410}
323 }; 411
324 $TICK_WATCHER->stop; 412=item cf::periodic $interval, $cb
325 $guard 413
414Like EV::periodic, but randomly selects a starting point so that the actions
415get spread over time.
416
417=cut
418
419sub periodic($$) {
420 my ($interval, $cb) = @_;
421
422 my $start = rand List::Util::min 180, $interval;
423
424 EV::periodic $start, $interval, 0, $cb
326} 425}
327 426
328=item cf::get_slot $time[, $priority[, $name]] 427=item cf::get_slot $time[, $priority[, $name]]
329 428
330Allocate $time seconds of blocking CPU time at priority C<$priority>: 429Allocate $time seconds of blocking CPU time at priority C<$priority>:
338 437
339=cut 438=cut
340 439
341our @SLOT_QUEUE; 440our @SLOT_QUEUE;
342our $SLOT_QUEUE; 441our $SLOT_QUEUE;
442our $SLOT_DECAY = 0.9;
343 443
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 444$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 445$SLOT_QUEUE = Coro::async {
446 $Coro::current->desc ("timeslot manager");
447
346 my $signal = new Coro::Signal; 448 my $signal = new Coro::Signal;
449 my $busy;
347 450
348 while () { 451 while () {
349 next_job: 452 next_job:
453
350 my $avail = cf::till_tick; 454 my $avail = cf::till_tick;
351 if ($avail > 0.01) { 455
352 for (0 .. $#SLOT_QUEUE) { 456 for (0 .. $#SLOT_QUEUE) {
353 if ($SLOT_QUEUE[$_][0] < $avail) { 457 if ($SLOT_QUEUE[$_][0] <= $avail) {
458 $busy = 0;
354 my $job = splice @SLOT_QUEUE, $_, 1, (); 459 my $job = splice @SLOT_QUEUE, $_, 1, ();
355 $job->[2]->send; 460 $job->[2]->send;
356 Coro::cede; 461 Coro::cede;
357 goto next_job; 462 goto next_job;
358 } 463 } else {
464 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
359 } 465 }
360 } 466 }
361 467
362 if (@SLOT_QUEUE) { 468 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive 469 # we do not use wait_for_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal; 470 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 471 $signal->wait;
366 } else { 472 } else {
473 $busy = 0;
367 Coro::schedule; 474 Coro::schedule;
368 } 475 }
369 } 476 }
370}; 477};
371 478
372sub get_slot($;$$) { 479sub get_slot($;$$) {
480 return if tick_inhibit || $Coro::current == $Coro::main;
481
373 my ($time, $pri, $name) = @_; 482 my ($time, $pri, $name) = @_;
374 483
375 $time = $TICK * .6 if $time > $TICK * .6; 484 $time = clamp $time, 0.01, $TICK * .6;
485
376 my $sig = new Coro::Signal; 486 my $sig = new Coro::Signal;
377 487
378 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 488 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
379 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 489 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
380 $SLOT_QUEUE->ready; 490 $SLOT_QUEUE->ready;
391 501
392BEGIN { *async = \&Coro::async_pool } 502BEGIN { *async = \&Coro::async_pool }
393 503
394=item cf::sync_job { BLOCK } 504=item cf::sync_job { BLOCK }
395 505
396The design of Crossfire TRT requires that the main coroutine ($Coro::main) 506The design of Deliantra requires that the main coroutine ($Coro::main)
397is always able to handle events or runnable, as Crossfire TRT is only 507is always able to handle events or runnable, as Deliantra is only
398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 508partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable. 509acceptable.
400 510
401If it must be done, put the blocking parts into C<sync_job>. This will run 511If it must be done, put the blocking parts into C<sync_job>. This will run
402the given BLOCK in another coroutine while waiting for the result. The 512the given BLOCK in another coroutine while waiting for the result. The
406=cut 516=cut
407 517
408sub sync_job(&) { 518sub sync_job(&) {
409 my ($job) = @_; 519 my ($job) = @_;
410 520
411 if ($Coro::current == $Coro::main) { 521 if (in_main) {
412 my $time = Event::time; 522 my $time = AE::time;
413 523
414 # this is the main coro, too bad, we have to block 524 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 525 # till the operation succeeds, freezing the server :/
416 526
417 # TODO: use suspend/resume instead 527 #LOG llevError, Carp::longmess "sync job";#d#
418 # (but this is cancel-safe) 528
419 my $freeze_guard = freeze_mainloop; 529 my $freeze_guard = freeze_mainloop;
420 530
421 my $busy = 1; 531 my $busy = 1;
422 my @res; 532 my @res;
423 533
424 (async { 534 (async {
535 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 536 @res = eval { $job->() };
426 warn $@ if $@; 537 error $@ if $@;
427 undef $busy; 538 undef $busy;
428 })->prio (Coro::PRIO_MAX); 539 })->prio (Coro::PRIO_MAX);
429 540
430 while ($busy) { 541 while ($busy) {
431 Coro::cede or Event::one_event; 542 if (Coro::nready) {
543 Coro::cede_notself;
544 } else {
545 EV::loop EV::LOOP_ONESHOT;
432 } 546 }
547 }
433 548
434 $time = Event::time - $time; 549 my $time = AE::time - $time;
435 550
436 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438
439 $tick_start += $time; # do not account sync jobs to server load 551 $TICK_START += $time; # do not account sync jobs to server load
440 552
441 wantarray ? @res : $res[0] 553 wantarray ? @res : $res[0]
442 } else { 554 } else {
443 # we are in another coroutine, how wonderful, everything just works 555 # we are in another coroutine, how wonderful, everything just works
444 556
469=item fork_call { }, $args 581=item fork_call { }, $args
470 582
471Executes the given code block with the given arguments in a seperate 583Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with 584process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may 585Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling. 586never block itself or use any form of event handling.
475 587
476=cut 588=cut
477 589
478sub fork_call(&@) { 590sub fork_call(&@) {
479 my ($cb, @args) = @_; 591 my ($cb, @args) = @_;
480 592
481 # we seemingly have to make a local copy of the whole thing, 593 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 594 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 595 # TODO: investigate and fix (likely this will be rather laborious)
484 596
485 my @res = Coro::Util::fork_eval { 597 my @res = Coro::Util::fork_eval {
486 reset_signals; 598 reset_signals;
487 &$cb 599 &$cb
488 }, @args; 600 }, @args;
489 601
490 wantarray ? @res : $res[-1] 602 wantarray ? @res : $res[-1]
491} 603}
492 604
605sub objinfo {
606 (
607 "counter value" => cf::object::object_count,
608 "objects created" => cf::object::create_count,
609 "objects destroyed" => cf::object::destroy_count,
610 "freelist size" => cf::object::free_count,
611 "allocated objects" => cf::object::objects_size,
612 "active objects" => cf::object::actives_size,
613 )
614}
615
616=item $coin = coin_from_name $name
617
618=cut
619
620our %coin_alias = (
621 "silver" => "silvercoin",
622 "silvercoin" => "silvercoin",
623 "silvercoins" => "silvercoin",
624 "gold" => "goldcoin",
625 "goldcoin" => "goldcoin",
626 "goldcoins" => "goldcoin",
627 "platinum" => "platinacoin",
628 "platinumcoin" => "platinacoin",
629 "platinumcoins" => "platinacoin",
630 "platina" => "platinacoin",
631 "platinacoin" => "platinacoin",
632 "platinacoins" => "platinacoin",
633 "royalty" => "royalty",
634 "royalties" => "royalty",
635);
636
637sub coin_from_name($) {
638 $coin_alias{$_[0]}
639 ? cf::arch::find $coin_alias{$_[0]}
640 : undef
641}
642
493=item $value = cf::db_get $family => $key 643=item $value = cf::db_get $family => $key
494 644
495Returns a single value from the environment database. 645Returns a single value from the environment database.
496 646
497=item cf::db_put $family => $key => $value 647=item cf::db_put $family => $key => $value
498 648
499Stores the given C<$value> in the family. It can currently store binary 649Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 650data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 651
652=item $db = cf::db_table "name"
653
654Create and/or open a new database table. The string must not be "db" and must be unique
655within each server.
656
502=cut 657=cut
658
659sub db_table($) {
660 cf::error "db_get called from main context"
661 if $Coro::current == $Coro::main;
662
663 my ($name) = @_;
664 my $db = BDB::db_create $DB_ENV;
665
666 eval {
667 $db->set_flags (BDB::CHKSUM);
668
669 utf8::encode $name;
670 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
671 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
672 cf::cleanup "db_open(db): $!" if $!;
673 };
674 cf::cleanup "db_open(db): $@" if $@;
675
676 $db
677}
503 678
504our $DB; 679our $DB;
505 680
506sub db_init { 681sub db_init {
507 unless ($DB) { 682 $DB ||= db_table "db";
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job {
511 eval {
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 }
521} 683}
522 684
523sub db_get($$) { 685sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 686 my $key = "$_[0]/$_[1]";
525 687
526 cf::sync_job { 688 cf::error "db_get called from main context"
689 if $Coro::current == $Coro::main;
690
527 BDB::db_get $DB, undef, $key, my $data; 691 BDB::db_get $DB, undef, $key, my $data;
528 692
529 $! ? () 693 $! ? ()
530 : $data 694 : $data
531 }
532} 695}
533 696
534sub db_put($$$) { 697sub db_put($$$) {
535 BDB::dbreq_pri 4; 698 BDB::dbreq_pri 4;
536 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 699 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
575 if (1) { 738 if (1) {
576 $md5 = 739 $md5 =
577 join "\x00", 740 join "\x00",
578 $processversion, 741 $processversion,
579 map { 742 map {
580 Coro::cede; 743 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 744 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 745 } 0.. $#$src;
583 746
584 747
585 my $dbmd5 = db_get cache => "$id/md5"; 748 my $dbmd5 = db_get cache => "$id/md5";
592 755
593 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
594 my $data = $process->(\@data); 757 my $data = $process->(\@data);
595 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
596 759
597 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
598 761
599 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
600 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
601 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
602 765
612 775
613=cut 776=cut
614 777
615sub datalog($@) { 778sub datalog($@) {
616 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
617 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
618} 781}
619 782
620=back 783=back
621 784
622=cut 785=cut
623 786
624############################################################################# 787#############################################################################
625 788
626=head2 ATTACHABLE OBJECTS 789=head2 ATTACHABLE OBJECTS
627 790
628Many objects in crossfire are so-called attachable objects. That means you can 791Many objects in deliantra are so-called attachable objects. That means you can
629attach callbacks/event handlers (a collection of which is called an "attachment") 792attach callbacks/event handlers (a collection of which is called an "attachment")
630to it. All such attachable objects support the following methods. 793to it. All such attachable objects support the following methods.
631 794
632In the following description, CLASS can be any of C<global>, C<object> 795In the following description, CLASS can be any of C<global>, C<object>
633C<player>, C<client> or C<map> (i.e. the attachable objects in 796C<player>, C<client> or C<map> (i.e. the attachable objects in
634Crossfire TRT). 797Deliantra).
635 798
636=over 4 799=over 4
637 800
638=item $attachable->attach ($attachment, key => $value...) 801=item $attachable->attach ($attachment, key => $value...)
639 802
683=item cf::CLASS::attachment $name, ... 846=item cf::CLASS::attachment $name, ...
684 847
685Register an attachment by C<$name> through which attachable objects of the 848Register an attachment by C<$name> through which attachable objects of the
686given CLASS can refer to this attachment. 849given CLASS can refer to this attachment.
687 850
688Some classes such as crossfire maps and objects can specify attachments 851Some classes such as deliantra maps and objects can specify attachments
689that are attached at load/instantiate time, thus the need for a name. 852that are attached at load/instantiate time, thus the need for a name.
690 853
691These calls expect any number of the following handler/hook descriptions: 854These calls expect any number of the following handler/hook descriptions:
692 855
693=over 4 856=over 4
817 980
818 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
819 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
820 983
821 } elsif (ref $type) { 984 } elsif (ref $type) {
822 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
823 986
824 } else { 987 } else {
825 shift @arg; 988 shift @arg;
826 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
827 } 990 }
828 } 991 }
829} 992}
830 993
831sub _object_attach { 994sub _object_attach {
841 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
842 } 1005 }
843 1006
844 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
845 } else { 1008 } else {
846 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
847 } 1010 }
848 1011
849 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
850} 1013}
851 1014
910 1073
911 for (@$callbacks) { 1074 for (@$callbacks) {
912 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
913 1076
914 if ($@) { 1077 if ($@) {
915 warn "$@";
916 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
917 override; 1079 override;
918 } 1080 }
919 1081
920 return 1 if $override; 1082 return 1 if $override;
921 } 1083 }
922 1084
923 0 1085 0
924} 1086}
925 1087
926=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1088=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
927 1089
928=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1090=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
929 1091
930Generate an object-specific event with the given arguments. 1092Generate an object-specific event with the given arguments.
931 1093
937 1099
938=cut 1100=cut
939 1101
940############################################################################# 1102#############################################################################
941# object support 1103# object support
942#
943 1104
1105sub _object_equal($$);
1106sub _object_equal($$) {
1107 my ($a, $b) = @_;
1108
1109 return 0 unless (ref $a) eq (ref $b);
1110
1111 if ("HASH" eq ref $a) {
1112 my @ka = keys %$a;
1113 my @kb = keys %$b;
1114
1115 return 0 if @ka != @kb;
1116
1117 for (0 .. $#ka) {
1118 return 0 unless $ka[$_] eq $kb[$_];
1119 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1120 }
1121
1122 } elsif ("ARRAY" eq ref $a) {
1123
1124 return 0 if @$a != @$b;
1125
1126 for (0 .. $#$a) {
1127 return 0 unless _object_equal $a->[$_], $b->[$_];
1128 }
1129
1130 } elsif ($a ne $b) {
1131 return 0;
1132 }
1133
1134 1
1135}
1136
1137our $SLOW_MERGES;#d#
944sub _can_merge { 1138sub _can_merge {
945 my ($ob1, $ob2) = @_; 1139 my ($ob1, $ob2) = @_;
946 1140
947 local $Storable::canonical = 1; 1141 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1142
951 $fob1 eq $fob2 1143 # we do the slow way here
1144 return _object_equal $ob1, $ob2
952} 1145}
953 1146
954sub reattach { 1147sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1148 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1149 my ($obj) = @_;
957 1150
1151 # no longer needed after getting rid of delete_package?
958 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1152 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
959 1153
960 my $registry = $obj->registry; 1154 my $registry = $obj->registry;
961 1155
962 @$registry = (); 1156 @$registry = ();
963 1157
968 for (@$attach) { 1162 for (@$attach) {
969 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
970 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
971 } 1165 }
972 } else { 1166 } else {
973 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
974 } 1168 }
975 } 1169 }
976} 1170}
977 1171
978cf::attachable->attach ( 1172cf::attachable->attach (
979 prio => -1000000, 1173 prio => -1000000,
980 on_instantiate => sub { 1174 on_instantiate => sub {
981 my ($obj, $data) = @_; 1175 my ($obj, $data) = @_;
982 1176
983 $data = from_json $data; 1177 $data = decode_json $data;
984 1178
985 for (@$data) { 1179 for (@$data) {
986 my ($name, $args) = @$_; 1180 my ($name, $args) = @$_;
987 1181
988 $obj->attach ($name, %{$args || {} }); 1182 $obj->attach ($name, %{$args || {} });
1004sub object_freezer_save { 1198sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1006 1200
1007 sync_job { 1201 sync_job {
1008 if (length $$rdata) { 1202 if (length $$rdata) {
1203 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1011 1207
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1209 aio_chmod $fh, SAVE_MODE;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1211 if ($cf::USE_FSYNC) {
1212 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;
1213 aio_fsync $fh;
1214 }
1016 close $fh; 1215 aio_close $fh;
1017 1216
1018 if (@$objs) { 1217 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1218 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1219 aio_chmod $fh, SAVE_MODE;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1220 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1221 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 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;
1224 aio_fsync $fh;
1225 }
1024 close $fh; 1226 aio_close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1227 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1228 }
1027 } else { 1229 } else {
1028 aio_unlink "$filename.pst"; 1230 aio_unlink "$filename.pst";
1029 } 1231 }
1030 1232
1031 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1234
1235 $filename =~ s%/[^/]+$%%;
1236 aio_pathsync $filename if $cf::USE_FSYNC;
1032 } else { 1237 } else {
1033 warn "FATAL: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1034 } 1239 }
1035 } else { 1240 } else {
1036 aio_unlink $filename; 1241 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1038 } 1243 }
1039 } 1244 };
1040} 1245}
1041 1246
1042sub object_freezer_as_string { 1247sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1248 my ($rdata, $objs) = @_;
1044 1249
1056 or return; 1261 or return;
1057 1262
1058 unless (aio_stat "$filename.pst") { 1263 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1264 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1265 or return;
1266
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1267 my $st = eval { Coro::Storable::thaw $av };
1268 $av = $st->{objs};
1062 } 1269 }
1063 1270
1271 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1275
1066 return ($data, $av); 1276 ($data, $av)
1067} 1277}
1068 1278
1069=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
1070 1280
1071=over 4 1281=over 4
1125 my ($name, $cb) = @_; 1335 my ($name, $cb) = @_;
1126 1336
1127 $EXTICMD{$name} = $cb; 1337 $EXTICMD{$name} = $cb;
1128} 1338}
1129 1339
1340use File::Glob ();
1341
1130cf::player->attach ( 1342cf::player->attach (
1131 on_command => sub { 1343 on_unknown_command => sub {
1132 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1133 1345
1134 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1135 or return; 1347 or return;
1136 1348
1159 1371
1160 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1161 if $reply; 1373 if $reply;
1162 1374
1163 } else { 1375 } else {
1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1165 } 1377 }
1166 1378
1167 cf::override; 1379 cf::override;
1168 }, 1380 },
1169); 1381);
1170 1382
1383# "readahead" all extensions
1384sub cache_extensions {
1385 my $grp = IO::AIO::aio_group;
1386
1387 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1388 for (grep /\.ext$/, @{$_[0]}) {
1389 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1390 }
1391 };
1392
1393 $grp
1394}
1395
1171sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1172 cf::sync_job { 1399 cf::sync_job {
1173 my %todo; 1400 my %todo;
1174 1401
1175 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1176 next unless -r $path; 1403 next unless -r $path;
1194 1421
1195 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1422 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1196 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1423 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1197 1424
1198 $ext{source} = 1425 $ext{source} =
1199 "package $pkg; use strict; use utf8;\n" 1426 "package $pkg; use common::sense;\n"
1200 . "#line 1 \"$path\"\n{\n" 1427 . "#line 1 \"$path\"\n{\n"
1201 . $source 1428 . $source
1202 . "\n};\n1"; 1429 . "\n};\n1";
1203 1430
1204 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1205 } 1432 }
1206 1433
1434 my $pass = 0;
1207 my %done; 1435 my %done;
1208 while (%todo) { 1436 while (%todo) {
1209 my $progress; 1437 my $progress;
1210 1438
1439 ++$pass;
1440
1441 ext:
1211 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1212 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1213 goto skip 1444 next ext
1214 unless exists $done{$_}; 1445 unless exists $done{$_};
1215 } 1446 }
1216 1447
1217 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1218 1449
1219 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1220 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1221 : "$v->{base}: extension inactive.\n"; 1454 undef $@; # work around perl 5.10.0 utf-8 caching bug
1222 1455
1456 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1223 if (exists $v->{meta}{mandatory}) { 1457 if exists $v->{meta}{mandatory};
1224 warn $msg; 1458
1225 warn "mandatory extension failed to load, exiting.\n"; 1459 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1226 exit 1; 1460 delete $todo{$k};
1227 } 1461 } else {
1228 1462 $done{$k} = delete $todo{$k};
1229 warn $msg; 1463 push @EXTS, $v->{pkg};
1464 $progress = 1;
1465
1466 info "$v->{base}: extension inactive.\n"
1467 unless $active;
1230 } 1468 }
1231
1232 $done{$k} = delete $todo{$k};
1233 push @EXTS, $v->{pkg};
1234 $progress = 1;
1235 } 1469 }
1236 1470
1237 skip: 1471 unless ($progress) {
1238 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1472 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1239 unless $progress; 1473
1474 while (my ($k, $v) = each %todo) {
1475 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1476 if exists $v->{meta}{mandatory};
1477 }
1478 }
1240 } 1479 }
1241 }; 1480 };
1242} 1481}
1243 1482
1244############################################################################# 1483#############################################################################
1245 1484
1246=back 1485=back
1247 1486
1248=head2 CORE EXTENSIONS 1487=head2 CORE EXTENSIONS
1249 1488
1250Functions and methods that extend core crossfire objects. 1489Functions and methods that extend core deliantra objects.
1251 1490
1252=cut 1491=cut
1253 1492
1254package cf::player; 1493package cf::player;
1255 1494
1256use Coro::AIO; 1495use Coro::AIO;
1257 1496
1258=head3 cf::player 1497=head3 cf::player
1259 1498
1260=over 4 1499=over 4
1500
1501=item cf::player::num_playing
1502
1503Returns the official number of playing players, as per the Crossfire metaserver rules.
1504
1505=cut
1506
1507sub num_playing {
1508 scalar grep
1509 $_->ob->map
1510 && !$_->hidden
1511 && !$_->ob->flag (cf::FLAG_WIZ),
1512 cf::player::list
1513}
1261 1514
1262=item cf::player::find $login 1515=item cf::player::find $login
1263 1516
1264Returns the given player object, loading it if necessary (might block). 1517Returns the given player object, loading it if necessary (might block).
1265 1518
1284 1537
1285sub exists($) { 1538sub exists($) {
1286 my ($login) = @_; 1539 my ($login) = @_;
1287 1540
1288 $cf::PLAYER{$login} 1541 $cf::PLAYER{$login}
1289 or cf::sync_job { !aio_stat path $login } 1542 or !aio_stat path $login
1290} 1543}
1291 1544
1292sub find($) { 1545sub find($) {
1293 return $cf::PLAYER{$_[0]} || do { 1546 return $cf::PLAYER{$_[0]} || do {
1294 my $login = $_[0]; 1547 my $login = $_[0];
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1554 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1555 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1556 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1557 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1558
1306 my $pl = load_pl path $login 1559 my $f = new_from_file cf::object::thawer path $login
1307 or return; 1560 or return;
1561
1562 my $pl = cf::player::load_pl $f
1563 or return;
1564
1565 local $cf::PLAYER_LOADING{$login} = $pl;
1566 $f->resolve_delayed_derefs;
1308 $cf::PLAYER{$login} = $pl 1567 $cf::PLAYER{$login} = $pl
1309 } 1568 }
1310 } 1569 }
1311} 1570}
1571
1572cf::player->attach (
1573 on_load => sub {
1574 my ($pl, $path) = @_;
1575
1576 # restore slots saved in save, below
1577 my $slots = delete $pl->{_slots};
1578
1579 $pl->ob->current_weapon ($slots->[0]);
1580 $pl->combat_ob ($slots->[1]);
1581 $pl->ranged_ob ($slots->[2]);
1582 },
1583);
1312 1584
1313sub save($) { 1585sub save($) {
1314 my ($pl) = @_; 1586 my ($pl) = @_;
1315 1587
1316 return if $pl->{deny_save}; 1588 return if $pl->{deny_save};
1321 return if $pl->{deny_save}; 1593 return if $pl->{deny_save};
1322 1594
1323 aio_mkdir playerdir $pl, 0770; 1595 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1596 $pl->{last_save} = $cf::RUNTIME;
1325 1597
1598 cf::get_slot 0.01;
1599
1600 # save slots, to be restored later
1601 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1602
1326 $pl->save_pl ($path); 1603 $pl->save_pl ($path);
1327 Coro::cede; 1604 cf::cede_to_tick;
1328} 1605}
1329 1606
1330sub new($) { 1607sub new($) {
1331 my ($login) = @_; 1608 my ($login) = @_;
1332 1609
1361 my ($pl) = @_; 1638 my ($pl) = @_;
1362 1639
1363 my $name = $pl->ob->name; 1640 my $name = $pl->ob->name;
1364 1641
1365 $pl->{deny_save} = 1; 1642 $pl->{deny_save} = 1;
1366 $pl->password ("*"); # this should lock out the player until we nuked the dir 1643 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1367 1644
1368 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1645 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1369 $pl->deactivate; 1646 $pl->deactivate;
1647 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1370 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1648 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1371 $pl->ns->destroy if $pl->ns; 1649 $pl->ns->destroy if $pl->ns;
1372 1650
1373 my $path = playerdir $pl; 1651 my $path = playerdir $pl;
1374 my $temp = "$path~$cf::RUNTIME~deleting~"; 1652 my $temp = "$path~$cf::RUNTIME~deleting~";
1410 or return []; 1688 or return [];
1411 1689
1412 my @logins; 1690 my @logins;
1413 1691
1414 for my $login (@$dirs) { 1692 for my $login (@$dirs) {
1693 my $path = path $login;
1694
1695 # a .pst is a dead give-away for a valid player
1696 # if no pst file found, open and chekc for blocked users
1697 if (aio_stat "$path.pst") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1698 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1699 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1700 $buf !~ /^password -------------$/m or next; # official not-valid tag
1701 }
1418 1702
1419 utf8::decode $login; 1703 utf8::decode $login;
1420 push @logins, $login; 1704 push @logins, $login;
1421 } 1705 }
1422 1706
1423 \@logins 1707 \@logins
1424} 1708}
1425 1709
1426=item $player->maps 1710=item $player->maps
1711
1712=item cf::player::maps $login
1427 1713
1428Returns an arrayref of map paths that are private for this 1714Returns an arrayref of map paths that are private for this
1429player. May block. 1715player. May block.
1430 1716
1431=cut 1717=cut
1449 } 1735 }
1450 1736
1451 \@paths 1737 \@paths
1452} 1738}
1453 1739
1454=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1740=item $protocol_xml = $player->expand_cfpod ($cfpod)
1455 1741
1456Expand crossfire pod fragments into protocol xml. 1742Expand deliantra pod fragments into protocol xml.
1457
1458=cut
1459
1460sub expand_cfpod {
1461 ((my $self), (local $_)) = @_;
1462
1463 # escape & and <
1464 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g;
1466
1467 # this is buggy, it needs to properly take care of nested <'s
1468
1469 1 while
1470 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/
1474 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1
1477 }ge
1478 # replace H<hint text>
1479 || s{H<([^\>]*)>}
1480 {
1481 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1482 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1483 "")
1484 [$self->{hintmode}]
1485 }ge;
1486
1487 # create single paragraphs (very hackish)
1488 s/(?<=\S)\n(?=\w)/ /g;
1489
1490 # compress some whitespace
1491 s/\s+\n/\n/g; # ws line-ends
1492 s/\n\n+/\n/g; # double lines
1493 s/^\n+//; # beginning lines
1494 s/\n+$//; # ending lines
1495
1496 $_
1497}
1498
1499sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode}
1502}
1503 1743
1504=item $player->ext_reply ($msgid, @msg) 1744=item $player->ext_reply ($msgid, @msg)
1505 1745
1506Sends an ext reply to the player. 1746Sends an ext reply to the player.
1507 1747
1539 1779
1540=cut 1780=cut
1541 1781
1542sub find_by_path($) { 1782sub find_by_path($) {
1543 my ($path) = @_; 1783 my ($path) = @_;
1784
1785 $path =~ s/^~[^\/]*//; # skip ~login
1544 1786
1545 my ($match, $specificity); 1787 my ($match, $specificity);
1546 1788
1547 for my $region (list) { 1789 for my $region (list) {
1548 if ($region->{match} && $path =~ $region->{match}) { 1790 if ($region->{match} && $path =~ $region->{match}) {
1574our $MAX_RESET = 3600; 1816our $MAX_RESET = 3600;
1575our $DEFAULT_RESET = 3000; 1817our $DEFAULT_RESET = 3000;
1576 1818
1577sub generate_random_map { 1819sub generate_random_map {
1578 my ($self, $rmp) = @_; 1820 my ($self, $rmp) = @_;
1821
1822 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1823
1579 # mit "rum" bekleckern, nicht 1824 # mit "rum" bekleckern, nicht
1580 $self->_create_random_map ( 1825 $self->_create_random_map (
1581 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1826 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1582 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1827 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1583 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1828 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1584 $rmp->{exit_on_final_map}, 1829 $rmp->{exit_on_final_map},
1585 $rmp->{xsize}, $rmp->{ysize}, 1830 $rmp->{xsize}, $rmp->{ysize},
1586 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1831 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1587 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1832 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1602 1847
1603sub register { 1848sub register {
1604 my (undef, $regex, $prio) = @_; 1849 my (undef, $regex, $prio) = @_;
1605 my $pkg = caller; 1850 my $pkg = caller;
1606 1851
1607 no strict;
1608 push @{"$pkg\::ISA"}, __PACKAGE__; 1852 push @{"$pkg\::ISA"}, __PACKAGE__;
1609 1853
1610 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1611} 1855}
1612 1856
1613# also paths starting with '/' 1857# also paths starting with '/'
1614$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1615 1859
1616sub thawer_merge { 1860sub thawer_merge {
1617 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1618 1862
1619 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
1705 1949
1706# the temporary/swap location 1950# the temporary/swap location
1707sub save_path { 1951sub save_path {
1708 my ($self) = @_; 1952 my ($self) = @_;
1709 1953
1710 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1954 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1711 "$TMPDIR/$path.map" 1955 "$TMPDIR/$path.map"
1712} 1956}
1713 1957
1714# the unique path, undef == no special unique path 1958# the unique path, undef == no special unique path
1715sub uniq_path { 1959sub uniq_path {
1716 my ($self) = @_; 1960 my ($self) = @_;
1717 1961
1718 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1962 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1719 "$UNIQUEDIR/$path" 1963 "$UNIQUEDIR/$path"
1720}
1721
1722# and all this just because we cannot iterate over
1723# all maps in C++...
1724sub change_all_map_light {
1725 my ($change) = @_;
1726
1727 $_->change_map_light ($change)
1728 for grep $_->outdoor, values %cf::MAP;
1729} 1964}
1730 1965
1731sub decay_objects { 1966sub decay_objects {
1732 my ($self) = @_; 1967 my ($self) = @_;
1733 1968
1746 1981
1747sub load_header_from($) { 1982sub load_header_from($) {
1748 my ($self, $path) = @_; 1983 my ($self, $path) = @_;
1749 1984
1750 utf8::encode $path; 1985 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1986 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 or return; 1987 or return;
1988
1989 $self->_load_header ($f)
1990 or return;
1991
1992 local $MAP_LOADING{$self->{path}} = $self;
1993 $f->resolve_delayed_derefs;
1756 1994
1757 $self->{load_path} = $path; 1995 $self->{load_path} = $path;
1758 1996
1759 1 1997 1
1760} 1998}
1814sub find { 2052sub find {
1815 my ($path, $origin) = @_; 2053 my ($path, $origin) = @_;
1816 2054
1817 $path = normalise $path, $origin && $origin->path; 2055 $path = normalise $path, $origin && $origin->path;
1818 2056
2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 2058 my $guard2 = cf::lock_acquire "map_find:$path";
1820 2059
1821 $cf::MAP{$path} || do { 2060 $cf::MAP{$path} || do {
1822 my $guard = cf::lock_acquire "map_find:$path";
1823 my $map = new_from_path cf::map $path 2061 my $map = new_from_path cf::map $path
1824 or return; 2062 or return;
1825 2063
1826 $map->{last_save} = $cf::RUNTIME; 2064 $map->{last_save} = $cf::RUNTIME;
1827 2065
1829 or return; 2067 or return;
1830 2068
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2069 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 2070 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 2071 #$cf::WAIT_FOR_TICK->wait;
2072 undef $guard2;
2073 undef $guard1;
1834 $map->reset; 2074 $map->reset;
1835 undef $guard;
1836 return find $path; 2075 return find $path;
1837 } 2076 }
1838 2077
1839 $cf::MAP{$path} = $map 2078 $cf::MAP{$path} = $map
1840 } 2079 }
1841} 2080}
1842 2081
1843sub pre_load { } 2082sub pre_load { }
1844sub post_load { } 2083#sub post_load { } # XS
1845 2084
1846sub load { 2085sub load {
1847 my ($self) = @_; 2086 my ($self) = @_;
1848 2087
1849 local $self->{deny_reset} = 1; # loading can take a long time 2088 local $self->{deny_reset} = 1; # loading can take a long time
1850 2089
1851 my $path = $self->{path}; 2090 my $path = $self->{path};
1852 2091
1853 { 2092 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 2093 my $guard = cf::lock_acquire "map_data:$path";
1855 2094
2095 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 2096 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 2097
1858 $self->in_memory (cf::MAP_LOADING); 2098 $self->in_memory (cf::MAP_LOADING);
1859 2099
1860 $self->alloc; 2100 $self->alloc;
1861 2101
1862 $self->pre_load; 2102 $self->pre_load;
1863 Coro::cede; 2103 cf::cede_to_tick;
1864 2104
2105 my $f = new_from_file cf::object::thawer $self->{load_path};
2106 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 2107 $self->_load_objects ($f)
1866 or return; 2108 or return;
1867 2109
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2110 $self->post_load_original
1869 if delete $self->{load_original}; 2111 if delete $self->{load_original};
1870 2112
1871 if (my $uniq = $self->uniq_path) { 2113 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 2114 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 2115 unless (aio_stat $uniq) {
2116 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 2117 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 2118 $self->_load_objects ($f);
2119 $f->resolve_delayed_derefs;
2120 }
1876 } 2121 }
1877 } 2122 }
1878 2123
1879 Coro::cede; 2124 $f->resolve_delayed_derefs;
2125
2126 cf::cede_to_tick;
1880 # now do the right thing for maps 2127 # now do the right thing for maps
1881 $self->link_multipart_objects; 2128 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 2129 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 2130 unless $self->difficulty;
1884 Coro::cede; 2131 cf::cede_to_tick;
1885 2132
1886 unless ($self->{deny_activate}) { 2133 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 2134 $self->decay_objects;
1888 $self->fix_auto_apply; 2135 $self->fix_auto_apply;
1889 $self->update_buttons; 2136 $self->update_buttons;
1890 Coro::cede; 2137 cf::cede_to_tick;
1891 $self->set_darkness_map;
1892 Coro::cede;
1893 $self->activate; 2138 $self->activate;
1894 } 2139 }
1895 2140
1896 $self->{last_save} = $cf::RUNTIME; 2141 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 2142 $self->last_access ($cf::RUNTIME);
1898 2143
1899 $self->in_memory (cf::MAP_IN_MEMORY); 2144 $self->in_memory (cf::MAP_ACTIVE);
1900 } 2145 }
1901 2146
1902 $self->post_load; 2147 $self->post_load;
1903} 2148}
1904 2149
2150# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath
1905sub customise_for { 2153sub customise_for {
1906 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
1907 2155
1908 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
1909 if $self->per_player; 2157 if $self->per_player;
1925 or next; 2173 or next;
1926 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
1927 or next; 2175 or next;
1928 $neigh->load; 2176 $neigh->load;
1929 2177
2178 # now find the diagonal neighbours
1930 push @neigh, 2179 push @neigh,
1931 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1932 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1933 } 2182 }
1934 2183
1941} 2190}
1942 2191
1943sub find_sync { 2192sub find_sync {
1944 my ($path, $origin) = @_; 2193 my ($path, $origin) = @_;
1945 2194
1946 cf::sync_job { find $path, $origin } 2195 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2196 if $Coro::current == $Coro::main;
2197
2198 find $path, $origin
1947} 2199}
1948 2200
1949sub do_load_sync { 2201sub do_load_sync {
1950 my ($map) = @_; 2202 my ($map) = @_;
1951 2203
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2204 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current == $Coro::main; 2205 if $Coro::current == $Coro::main;
1954 2206
1955 cf::sync_job { $map->load }; 2207 $map->load;
1956} 2208}
1957 2209
1958our %MAP_PREFETCH; 2210our %MAP_PREFETCH;
1959our $MAP_PREFETCHER = undef; 2211our $MAP_PREFETCHER = undef;
1960 2212
1962 my ($path, $origin, $load) = @_; 2214 my ($path, $origin, $load) = @_;
1963 2215
1964 $path = normalise $path, $origin && $origin->{path}; 2216 $path = normalise $path, $origin && $origin->{path};
1965 2217
1966 if (my $map = $cf::MAP{$path}) { 2218 if (my $map = $cf::MAP{$path}) {
1967 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2219 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1968 } 2220 }
1969 2221
1970 $MAP_PREFETCH{$path} |= $load; 2222 $MAP_PREFETCH{$path} |= $load;
1971 2223
1972 $MAP_PREFETCHER ||= cf::async { 2224 $MAP_PREFETCHER ||= cf::async {
2225 $Coro::current->{desc} = "map prefetcher";
2226
1973 while (%MAP_PREFETCH) { 2227 while (%MAP_PREFETCH) {
1974 while (my ($k, $v) = each %MAP_PREFETCH) { 2228 while (my ($k, $v) = each %MAP_PREFETCH) {
1975 if (my $map = find $k) { 2229 if (my $map = find $k) {
1976 $map->load if $v; 2230 $map->load if $v;
1977 } 2231 }
1984 $MAP_PREFETCHER->prio (6); 2238 $MAP_PREFETCHER->prio (6);
1985 2239
1986 () 2240 ()
1987} 2241}
1988 2242
2243# common code, used by both ->save and ->swapout
1989sub save { 2244sub _save {
1990 my ($self) = @_; 2245 my ($self) = @_;
1991
1992 my $lock = cf::lock_acquire "map_data:" . $self->path;
1993 2246
1994 $self->{last_save} = $cf::RUNTIME; 2247 $self->{last_save} = $cf::RUNTIME;
1995 2248
1996 return unless $self->dirty; 2249 return unless $self->dirty;
1997 2250
2003 return if $self->{deny_save}; 2256 return if $self->{deny_save};
2004 2257
2005 local $self->{last_access} = $self->last_access;#d# 2258 local $self->{last_access} = $self->last_access;#d#
2006 2259
2007 cf::async { 2260 cf::async {
2261 $Coro::current->{desc} = "map player save";
2008 $_->contr->save for $self->players; 2262 $_->contr->save for $self->players;
2009 }; 2263 };
2264
2265 cf::get_slot 0.02;
2010 2266
2011 if ($uniq) { 2267 if ($uniq) {
2012 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2268 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2013 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2269 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2014 } else { 2270 } else {
2015 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2271 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2016 } 2272 }
2017} 2273}
2018 2274
2275sub save {
2276 my ($self) = @_;
2277
2278 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279
2280 $self->_save;
2281}
2282
2019sub swap_out { 2283sub swap_out {
2020 my ($self) = @_; 2284 my ($self) = @_;
2021 2285
2022 # save first because save cedes
2023 $self->save;
2024
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2287
2288 return if $self->in_memory != cf::MAP_ACTIVE;
2289 return if $self->{deny_save};
2027 return if $self->players; 2290 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY;
2029 return if $self->{deny_save};
2030 2291
2292 # first deactivate the map and "unlink" it from the core
2293 $self->deactivate;
2294 $_->clear_links_to ($self) for values %cf::MAP;
2295 $self->in_memory (cf::MAP_SWAPPED);
2296
2297 # then atomically save
2298 $self->_save;
2299
2300 # then free the map
2031 $self->clear; 2301 $self->clear;
2032 $self->in_memory (cf::MAP_SWAPPED);
2033} 2302}
2034 2303
2035sub reset_at { 2304sub reset_at {
2036 my ($self) = @_; 2305 my ($self) = @_;
2037 2306
2055 2324
2056 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2325 my $lock = cf::lock_acquire "map_data:$self->{path}";
2057 2326
2058 return if $self->players; 2327 return if $self->players;
2059 2328
2060 warn "resetting map ", $self->path; 2329 cf::trace "resetting map ", $self->path, "\n";
2061 2330
2062 $self->in_memory (cf::MAP_SWAPPED); 2331 $self->in_memory (cf::MAP_SWAPPED);
2063 2332
2064 # need to save uniques path 2333 # need to save uniques path
2065 unless ($self->{deny_save}) { 2334 unless ($self->{deny_save}) {
2069 if $uniq; 2338 if $uniq;
2070 } 2339 }
2071 2340
2072 delete $cf::MAP{$self->path}; 2341 delete $cf::MAP{$self->path};
2073 2342
2343 $self->deactivate;
2344 $_->clear_links_to ($self) for values %cf::MAP;
2074 $self->clear; 2345 $self->clear;
2075
2076 $_->clear_links_to ($self) for values %cf::MAP;
2077 2346
2078 $self->unlink_save; 2347 $self->unlink_save;
2079 $self->destroy; 2348 $self->destroy;
2080} 2349}
2081 2350
2082my $nuke_counter = "aaaa"; 2351my $nuke_counter = "aaaa";
2083 2352
2084sub nuke { 2353sub nuke {
2085 my ($self) = @_; 2354 my ($self) = @_;
2086 2355
2356 {
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2087 delete $cf::MAP{$self->path}; 2359 delete $cf::MAP{$self->path};
2088 2360
2089 $self->unlink_save; 2361 $self->unlink_save;
2090 2362
2091 bless $self, "cf::map"; 2363 bless $self, "cf::map::wrap";
2092 delete $self->{deny_reset}; 2364 delete $self->{deny_reset};
2093 $self->{deny_save} = 1; 2365 $self->{deny_save} = 1;
2094 $self->reset_timeout (1); 2366 $self->reset_timeout (1);
2095 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2367 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2096 2368
2097 $cf::MAP{$self->path} = $self; 2369 $cf::MAP{$self->path} = $self;
2370 }
2098 2371
2099 $self->reset; # polite request, might not happen 2372 $self->reset; # polite request, might not happen
2100} 2373}
2101 2374
2102=item $maps = cf::map::tmp_maps 2375=item $maps = cf::map::tmp_maps
2144 2417
2145sub unique_maps() { 2418sub unique_maps() {
2146 [ 2419 [
2147 map { 2420 map {
2148 utf8::decode $_; 2421 utf8::decode $_;
2149 /\.map$/ 2422 s/\.map$//; # TODO future compatibility hack
2423 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2424 ? ()
2150 ? normalise $_ 2425 : normalise $_
2151 : ()
2152 } @{ aio_readdir $UNIQUEDIR or [] } 2426 } @{ aio_readdir $UNIQUEDIR or [] }
2153 ] 2427 ]
2154} 2428}
2155 2429
2156package cf; 2430=item cf::map::static_maps
2431
2432Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2433file in the shared directory excluding F</styles> and F</editor>). May
2434block.
2435
2436=cut
2437
2438sub static_maps() {
2439 my @dirs = "";
2440 my @maps;
2441
2442 while (@dirs) {
2443 my $dir = shift @dirs;
2444
2445 next if $dir eq "/styles" || $dir eq "/editor";
2446
2447 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2448 or return;
2449
2450 for (@$files) {
2451 s/\.map$// or next;
2452 utf8::decode $_;
2453 push @maps, "$dir/$_";
2454 }
2455
2456 push @dirs, map "$dir/$_", @$dirs;
2457 }
2458
2459 \@maps
2460}
2157 2461
2158=back 2462=back
2159 2463
2160=head3 cf::object 2464=head3 cf::object
2161 2465
2165 2469
2166=over 4 2470=over 4
2167 2471
2168=item $ob->inv_recursive 2472=item $ob->inv_recursive
2169 2473
2170Returns the inventory of the object _and_ their inventories, recursively. 2474Returns the inventory of the object I<and> their inventories, recursively,
2475but I<not> the object itself.
2171 2476
2172=cut 2477=cut
2173 2478
2174sub inv_recursive_; 2479sub inv_recursive_;
2175sub inv_recursive_ { 2480sub inv_recursive_ {
2178 2483
2179sub inv_recursive { 2484sub inv_recursive {
2180 inv_recursive_ inv $_[0] 2485 inv_recursive_ inv $_[0]
2181} 2486}
2182 2487
2488=item $ref = $ob->ref
2489
2490Creates and returns a persistent reference to an object that can be stored as a string.
2491
2492=item $ob = cf::object::deref ($refstring)
2493
2494returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2495even if the object actually exists. May block.
2496
2497=cut
2498
2499sub deref {
2500 my ($ref) = @_;
2501
2502 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2503 my ($uuid, $name) = ($1, $2);
2504 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2505 or return;
2506 $pl->ob->uuid eq $uuid
2507 or return;
2508
2509 $pl->ob
2510 } else {
2511 warn "$ref: cannot resolve object reference\n";
2512 undef
2513 }
2514}
2515
2183package cf; 2516package cf;
2184 2517
2185=back 2518=back
2186 2519
2187=head3 cf::object::player 2520=head3 cf::object::player
2193Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2526Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2194can be C<undef>. Does the right thing when the player is currently in a 2527can be C<undef>. Does the right thing when the player is currently in a
2195dialogue with the given NPC character. 2528dialogue with the given NPC character.
2196 2529
2197=cut 2530=cut
2531
2532our $SAY_CHANNEL = {
2533 id => "say",
2534 title => "Map",
2535 reply => "say ",
2536 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2537};
2538
2539our $CHAT_CHANNEL = {
2540 id => "chat",
2541 title => "Chat",
2542 reply => "chat ",
2543 tooltip => "Player chat and shouts, global to the server.",
2544};
2198 2545
2199# rough implementation of a future "reply" method that works 2546# rough implementation of a future "reply" method that works
2200# with dialog boxes. 2547# with dialog boxes.
2201#TODO: the first argument must go, split into a $npc->reply_to ( method 2548#TODO: the first argument must go, split into a $npc->reply_to ( method
2202sub cf::object::player::reply($$$;$) { 2549sub cf::object::player::reply($$$;$) {
2214 my $dialog = $pl->{npc_dialog}; 2561 my $dialog = $pl->{npc_dialog};
2215 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2562 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2216 2563
2217 } else { 2564 } else {
2218 $msg = $npc->name . " says: $msg" if $npc; 2565 $msg = $npc->name . " says: $msg" if $npc;
2219 $self->message ($msg, $flags); 2566 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2220 } 2567 }
2221 } 2568 }
2222} 2569}
2223 2570
2224=item $object->send_msg ($channel, $msg, $color, [extra...]) 2571=item $object->send_msg ($channel, $msg, $color, [extra...])
2249 2596
2250=item $player_object->enter_link 2597=item $player_object->enter_link
2251 2598
2252Freezes the player and moves him/her to a special map (C<{link}>). 2599Freezes the player and moves him/her to a special map (C<{link}>).
2253 2600
2254The player should be reasonably safe there for short amounts of time. You 2601The player should be reasonably safe there for short amounts of time (e.g.
2255I<MUST> call C<leave_link> as soon as possible, though. 2602for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2603though, as the player cannot control the character while it is on the link
2604map.
2256 2605
2257Will never block. 2606Will never block.
2258 2607
2259=item $player_object->leave_link ($map, $x, $y) 2608=item $player_object->leave_link ($map, $x, $y)
2260 2609
2280sub cf::object::player::enter_link { 2629sub cf::object::player::enter_link {
2281 my ($self) = @_; 2630 my ($self) = @_;
2282 2631
2283 $self->deactivate_recursive; 2632 $self->deactivate_recursive;
2284 2633
2634 ++$self->{_link_recursion};
2635
2285 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2636 return if UNIVERSAL::isa $self->map, "ext::map_link";
2286 2637
2287 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2638 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2288 if $self->map && $self->map->{path} ne "{link}"; 2639 if $self->map && $self->map->{path} ne "{link}";
2289 2640
2290 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2641 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2291} 2642}
2292 2643
2293sub cf::object::player::leave_link { 2644sub cf::object::player::leave_link {
2294 my ($self, $map, $x, $y) = @_; 2645 my ($self, $map, $x, $y) = @_;
2295 2646
2312 ($x, $y) = (-1, -1) 2663 ($x, $y) = (-1, -1)
2313 unless (defined $x) && (defined $y); 2664 unless (defined $x) && (defined $y);
2314 2665
2315 # use -1 or undef as default coordinates, not 0, 0 2666 # use -1 or undef as default coordinates, not 0, 0
2316 ($x, $y) = ($map->enter_x, $map->enter_y) 2667 ($x, $y) = ($map->enter_x, $map->enter_y)
2317 if $x <=0 && $y <= 0; 2668 if $x <= 0 && $y <= 0;
2318 2669
2319 $map->load; 2670 $map->load;
2320 $map->load_neighbours; 2671 $map->load_neighbours;
2321 2672
2322 return unless $self->contr->active; 2673 return unless $self->contr->active;
2323 $self->activate_recursive;
2324 2674
2325 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2675 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2326 $self->enter_map ($map, $x, $y); 2676 if ($self->enter_map ($map, $x, $y)) {
2327} 2677 # entering was successful
2678 delete $self->{_link_recursion};
2679 # only activate afterwards, to support waiting in hooks
2680 $self->activate_recursive;
2681 }
2328 2682
2683}
2684
2329=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2685=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2330 2686
2331Moves the player to the given map-path and coordinates by first freezing 2687Moves the player to the given map-path and coordinates by first freezing
2332her, loading and preparing them map, calling the provided $check callback 2688her, loading and preparing them map, calling the provided $check callback
2333that has to return the map if sucecssful, and then unfreezes the player on 2689that has to return the map if sucecssful, and then unfreezes the player on
2334the new (success) or old (failed) map position. In either case, $done will 2690the new (success) or old (failed) map position. In either case, $done will
2335be called at the end of this process. 2691be called at the end of this process.
2336 2692
2693Note that $check will be called with a potentially non-loaded map, so if
2694it needs a loaded map it has to call C<< ->load >>.
2695
2337=cut 2696=cut
2338 2697
2339our $GOTOGEN; 2698our $GOTOGEN;
2340 2699
2341sub cf::object::player::goto { 2700sub cf::object::player::goto {
2342 my ($self, $path, $x, $y, $check, $done) = @_; 2701 my ($self, $path, $x, $y, $check, $done) = @_;
2343 2702
2703 if ($self->{_link_recursion} >= $MAX_LINKS) {
2704 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2705 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2706 ($path, $x, $y) = @$EMERGENCY_POSITION;
2707 }
2708
2344 # do generation counting so two concurrent goto's will be executed in-order 2709 # do generation counting so two concurrent goto's will be executed in-order
2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2710 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2346 2711
2347 $self->enter_link; 2712 $self->enter_link;
2348 2713
2349 (async { 2714 (async {
2715 $Coro::current->{desc} = "player::goto $path $x $y";
2716
2717 # *tag paths override both path and x|y
2718 if ($path =~ /^\*(.*)$/) {
2719 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2720 my $ob = $obs[rand @obs];
2721
2722 # see if we actually can go there
2723 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2724 $ob = $obs[rand @obs];
2725 } else {
2726 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2727 }
2728 # else put us there anyways for now #d#
2729
2730 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2731 } else {
2732 ($path, $x, $y) = (undef, undef, undef);
2733 }
2734 }
2735
2350 my $map = eval { 2736 my $map = eval {
2351 my $map = cf::map::find $path; 2737 my $map = defined $path ? cf::map::find $path : undef;
2352 2738
2353 if ($map) { 2739 if ($map) {
2354 $map = $map->customise_for ($self); 2740 $map = $map->customise_for ($self);
2355 $map = $check->($map) if $check && $map; 2741 $map = $check->($map, $x, $y, $self) if $check && $map;
2356 } else { 2742 } else {
2357 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2743 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2358 } 2744 }
2359 2745
2360 $map 2746 $map
2361 }; 2747 };
2362 2748
2368 if ($gen == $self->{_goto_generation}) { 2754 if ($gen == $self->{_goto_generation}) {
2369 delete $self->{_goto_generation}; 2755 delete $self->{_goto_generation};
2370 $self->leave_link ($map, $x, $y); 2756 $self->leave_link ($map, $x, $y);
2371 } 2757 }
2372 2758
2373 $done->() if $done; 2759 $done->($self) if $done;
2374 })->prio (1); 2760 })->prio (1);
2375} 2761}
2376 2762
2377=item $player_object->enter_exit ($exit_object) 2763=item $player_object->enter_exit ($exit_object)
2378 2764
2398} 2784}
2399 2785
2400sub prepare_random_map { 2786sub prepare_random_map {
2401 my ($exit) = @_; 2787 my ($exit) = @_;
2402 2788
2403 my $guard = cf::lock_acquire "exit_prepare:$exit";
2404
2405 # all this does is basically replace the /! path by 2789 # all this does is basically replace the /! path by
2406 # a new random map path (?random/...) with a seed 2790 # a new random map path (?random/...) with a seed
2407 # that depends on the exit object 2791 # that depends on the exit object
2408 2792
2409 my $rmp = parse_random_map_params $exit->msg; 2793 my $rmp = parse_random_map_params $exit->msg;
2411 if ($exit->map) { 2795 if ($exit->map) {
2412 $rmp->{region} = $exit->region->name; 2796 $rmp->{region} = $exit->region->name;
2413 $rmp->{origin_map} = $exit->map->path; 2797 $rmp->{origin_map} = $exit->map->path;
2414 $rmp->{origin_x} = $exit->x; 2798 $rmp->{origin_x} = $exit->x;
2415 $rmp->{origin_y} = $exit->y; 2799 $rmp->{origin_y} = $exit->y;
2800
2801 $exit->map->touch;
2416 } 2802 }
2417 2803
2418 $rmp->{random_seed} ||= $exit->random_seed; 2804 $rmp->{random_seed} ||= $exit->random_seed;
2419 2805
2420 my $data = cf::to_json $rmp; 2806 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2421 my $md5 = Digest::MD5::md5_hex $data; 2807 my $md5 = Digest::MD5::md5_hex $data;
2422 my $meta = "$RANDOMDIR/$md5.meta"; 2808 my $meta = "$RANDOMDIR/$md5.meta";
2423 2809
2424 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2810 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2425 aio_write $fh, 0, (length $data), $data, 0; 2811 aio_write $fh, 0, (length $data), $data, 0;
2426 undef $fh; 2812 undef $fh;
2427 aio_rename "$meta~", $meta; 2813 aio_rename "$meta~", $meta;
2428 2814
2815 my $slaying = "?random/$md5";
2816
2817 if ($exit->valid) {
2429 $exit->slaying ("?random/$md5"); 2818 $exit->slaying ("?random/$md5");
2430 $exit->msg (undef); 2819 $exit->msg (undef);
2820 }
2431 } 2821 }
2432} 2822}
2433 2823
2434sub cf::object::player::enter_exit { 2824sub cf::object::player::enter_exit {
2435 my ($self, $exit) = @_; 2825 my ($self, $exit) = @_;
2436 2826
2437 return unless $self->type == cf::PLAYER; 2827 return unless $self->type == cf::PLAYER;
2438 2828
2439 if ($exit->slaying eq "/!") {
2440 #TODO: this should de-fi-ni-te-ly not be a sync-job
2441 # the problem is that $exit might not survive long enough
2442 # so it needs to be done right now, right here
2443 cf::sync_job { prepare_random_map $exit };
2444 }
2445
2446 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2447 my $hp = $exit->stats->hp;
2448 my $sp = $exit->stats->sp;
2449
2450 $self->enter_link; 2829 $self->enter_link;
2451 2830
2452 # if exit is damned, update players death & WoR home-position
2453 $self->contr->savebed ($slaying, $hp, $sp)
2454 if $exit->flag (FLAG_DAMNED);
2455
2456 (async { 2831 (async {
2457 $self->deactivate_recursive; # just to be sure 2832 $Coro::current->{desc} = "enter_exit";
2833
2458 unless (eval { 2834 unless (eval {
2835 $self->deactivate_recursive; # just to be sure
2836
2837 # random map handling
2838 {
2839 my $guard = cf::lock_acquire "exit_prepare:$exit";
2840
2841 prepare_random_map $exit
2842 if $exit->slaying eq "/!";
2843 }
2844
2845 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2846 my $x = $exit->stats->hp;
2847 my $y = $exit->stats->sp;
2848
2459 $self->goto ($slaying, $hp, $sp); 2849 $self->goto ($map, $x, $y);
2460 2850
2851 # if exit is damned, update players death & WoR home-position
2852 $self->contr->savebed ($map, $x, $y)
2853 if $exit->flag (cf::FLAG_DAMNED);
2854
2461 1; 2855 1
2462 }) { 2856 }) {
2463 $self->message ("Something went wrong deep within the crossfire server. " 2857 $self->message ("Something went wrong deep within the deliantra server. "
2464 . "I'll try to bring you back to the map you were before. " 2858 . "I'll try to bring you back to the map you were before. "
2465 . "Please report this to the dungeon master!", 2859 . "Please report this to the dungeon master!",
2466 cf::NDI_UNIQUE | cf::NDI_RED); 2860 cf::NDI_UNIQUE | cf::NDI_RED);
2467 2861
2468 warn "ERROR in enter_exit: $@"; 2862 error "ERROR in enter_exit: $@";
2469 $self->leave_link; 2863 $self->leave_link;
2470 } 2864 }
2471 })->prio (1); 2865 })->prio (1);
2472} 2866}
2473 2867
2485sub cf::client::send_drawinfo { 2879sub cf::client::send_drawinfo {
2486 my ($self, $text, $flags) = @_; 2880 my ($self, $text, $flags) = @_;
2487 2881
2488 utf8::encode $text; 2882 utf8::encode $text;
2489 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2883 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2884}
2885
2886=item $client->send_big_packet ($pkt)
2887
2888Like C<send_packet>, but tries to compress large packets, and fragments
2889them as required.
2890
2891=cut
2892
2893our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2894
2895sub cf::client::send_big_packet {
2896 my ($self, $pkt) = @_;
2897
2898 # try lzf for large packets
2899 $pkt = "lzf " . Compress::LZF::compress $pkt
2900 if 1024 <= length $pkt and $self->{can_lzf};
2901
2902 # split very large packets
2903 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2904 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2905 $pkt = "frag";
2906 }
2907
2908 $self->send_packet ($pkt);
2490} 2909}
2491 2910
2492=item $client->send_msg ($channel, $msg, $color, [extra...]) 2911=item $client->send_msg ($channel, $msg, $color, [extra...])
2493 2912
2494Send a drawinfo or msg packet to the client, formatting the msg for the 2913Send a drawinfo or msg packet to the client, formatting the msg for the
2496the message, with C<log> being the default. If C<$color> is negative, suppress 2915the message, with C<log> being the default. If C<$color> is negative, suppress
2497the message unless the client supports the msg packet. 2916the message unless the client supports the msg packet.
2498 2917
2499=cut 2918=cut
2500 2919
2920# non-persistent channels (usually the info channel)
2921our %CHANNEL = (
2922 "c/motd" => {
2923 id => "infobox",
2924 title => "MOTD",
2925 reply => undef,
2926 tooltip => "The message of the day",
2927 },
2928 "c/identify" => {
2929 id => "infobox",
2930 title => "Identify",
2931 reply => undef,
2932 tooltip => "Items recently identified",
2933 },
2934 "c/examine" => {
2935 id => "infobox",
2936 title => "Examine",
2937 reply => undef,
2938 tooltip => "Signs and other items you examined",
2939 },
2940 "c/shopinfo" => {
2941 id => "infobox",
2942 title => "Shop Info",
2943 reply => undef,
2944 tooltip => "What your bargaining skill tells you about the shop",
2945 },
2946 "c/book" => {
2947 id => "infobox",
2948 title => "Book",
2949 reply => undef,
2950 tooltip => "The contents of a note or book",
2951 },
2952 "c/lookat" => {
2953 id => "infobox",
2954 title => "Look",
2955 reply => undef,
2956 tooltip => "What you saw there",
2957 },
2958 "c/who" => {
2959 id => "infobox",
2960 title => "Players",
2961 reply => undef,
2962 tooltip => "Shows players who are currently online",
2963 },
2964 "c/body" => {
2965 id => "infobox",
2966 title => "Body Parts",
2967 reply => undef,
2968 tooltip => "Shows which body parts you posess and are available",
2969 },
2970 "c/statistics" => {
2971 id => "infobox",
2972 title => "Statistics",
2973 reply => undef,
2974 tooltip => "Shows your primary statistics",
2975 },
2976 "c/skills" => {
2977 id => "infobox",
2978 title => "Skills",
2979 reply => undef,
2980 tooltip => "Shows your experience per skill and item power",
2981 },
2982 "c/shopitems" => {
2983 id => "infobox",
2984 title => "Shop Items",
2985 reply => undef,
2986 tooltip => "Shows the items currently for sale in this shop",
2987 },
2988 "c/resistances" => {
2989 id => "infobox",
2990 title => "Resistances",
2991 reply => undef,
2992 tooltip => "Shows your resistances",
2993 },
2994 "c/pets" => {
2995 id => "infobox",
2996 title => "Pets",
2997 reply => undef,
2998 tooltip => "Shows information abotu your pets/a specific pet",
2999 },
3000 "c/perceiveself" => {
3001 id => "infobox",
3002 title => "Perceive Self",
3003 reply => undef,
3004 tooltip => "You gained detailed knowledge about yourself",
3005 },
3006 "c/uptime" => {
3007 id => "infobox",
3008 title => "Uptime",
3009 reply => undef,
3010 tooltip => "How long the server has been running since last restart",
3011 },
3012 "c/mapinfo" => {
3013 id => "infobox",
3014 title => "Map Info",
3015 reply => undef,
3016 tooltip => "Information related to the maps",
3017 },
3018 "c/party" => {
3019 id => "party",
3020 title => "Party",
3021 reply => "gsay ",
3022 tooltip => "Messages and chat related to your party",
3023 },
3024 "c/death" => {
3025 id => "death",
3026 title => "Death",
3027 reply => undef,
3028 tooltip => "Reason for and more info about your most recent death",
3029 },
3030 "c/say" => $SAY_CHANNEL,
3031 "c/chat" => $CHAT_CHANNEL,
3032);
3033
2501sub cf::client::send_msg { 3034sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_; 3035 my ($self, $channel, $msg, $color, @extra) = @_;
2503 3036
2504 $msg = $self->pl->expand_cfpod ($msg); 3037 $msg = $self->pl->expand_cfpod ($msg)
3038 unless $color & cf::NDI_VERBATIM;
2505 3039
2506 $color &= cf::NDI_CLIENT_MASK; # just in case... 3040 $color &= cf::NDI_CLIENT_MASK; # just in case...
2507 3041
3042 # check predefined channels, for the benefit of C
3043 if ($CHANNEL{$channel}) {
3044 $channel = $CHANNEL{$channel};
3045
3046 $self->ext_msg (channel_info => $channel);
3047 $channel = $channel->{id};
3048
2508 if (ref $channel) { 3049 } elsif (ref $channel) {
2509 # send meta info to client, if not yet sent 3050 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) { 3051 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel; 3052 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel); 3053 $self->ext_msg (channel_info => $channel);
2513 } 3054 }
2515 $channel = $channel->{id}; 3056 $channel = $channel->{id};
2516 } 3057 }
2517 3058
2518 return unless @extra || length $msg; 3059 return unless @extra || length $msg;
2519 3060
2520 if ($self->can_msg) {
2521 # default colour, mask it out 3061 # default colour, mask it out
2522 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3062 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2523 if $color & cf::NDI_DEF; 3063 if $color & cf::NDI_DEF;
2524 3064
2525 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3065 my $pkt = "msg "
3066 . $self->{json_coder}->encode (
2526 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3067 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2527 } else { 3068 );
2528 if ($color >= 0) {
2529 # replace some tags by gcfclient-compatible ones
2530 for ($msg) {
2531 1 while
2532 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2533 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2534 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2535 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2536 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2537 }
2538 3069
2539 $color &= cf::NDI_COLOR_MASK; 3070 $self->send_big_packet ($pkt);
2540
2541 utf8::encode $msg;
2542
2543 if (0 && $msg =~ /\[/) {
2544 # COMMAND/INFO
2545 $self->send_packet ("drawextinfo $color 10 8 $msg")
2546 } else {
2547 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2548 $self->send_packet ("drawinfo $color $msg")
2549 }
2550 }
2551 }
2552} 3071}
2553 3072
2554=item $client->ext_msg ($type, @msg) 3073=item $client->ext_msg ($type, @msg)
2555 3074
2556Sends an ext event to the client. 3075Sends an ext event to the client.
2558=cut 3077=cut
2559 3078
2560sub cf::client::ext_msg($$@) { 3079sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 3080 my ($self, $type, @msg) = @_;
2562 3081
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) { 3082 if ($self->extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove 3084 } elsif ($self->extcmd == 1) { # TODO: remove
2568 push @msg, msgtype => "event_$type"; 3085 push @msg, msgtype => "event_$type";
2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3086 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 } 3087 }
2571} 3088}
2572 3089
2573=item $client->ext_reply ($msgid, @msg) 3090=item $client->ext_reply ($msgid, @msg)
2574 3091
2578 3095
2579sub cf::client::ext_reply($$@) { 3096sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_; 3097 my ($self, $id, @msg) = @_;
2581 3098
2582 if ($self->extcmd == 2) { 3099 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3100 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) { 3101 } elsif ($self->extcmd == 1) {
2585 #TODO: version 1, remove 3102 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id; 3103 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3104 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 } 3105 }
2589} 3106}
2590 3107
2591=item $success = $client->query ($flags, "text", \&cb) 3108=item $success = $client->query ($flags, "text", \&cb)
2592 3109
2663 3180
2664 $ns->ext_reply ($reply, @reply) 3181 $ns->ext_reply ($reply, @reply)
2665 if $reply; 3182 if $reply;
2666 3183
2667 } else { 3184 } else {
2668 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3185 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2669 } 3186 }
2670 3187
2671 cf::override; 3188 cf::override;
2672 }, 3189 },
2673); 3190);
2693 3210
2694 $coro 3211 $coro
2695} 3212}
2696 3213
2697cf::client->attach ( 3214cf::client->attach (
2698 on_destroy => sub { 3215 on_client_destroy => sub {
2699 my ($ns) = @_; 3216 my ($ns) = @_;
2700 3217
2701 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3218 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2702 }, 3219 },
2703); 3220);
2719our $safe_hole = new Safe::Hole; 3236our $safe_hole = new Safe::Hole;
2720 3237
2721$SIG{FPE} = 'IGNORE'; 3238$SIG{FPE} = 'IGNORE';
2722 3239
2723$safe->permit_only (Opcode::opset qw( 3240$safe->permit_only (Opcode::opset qw(
2724 :base_core :base_mem :base_orig :base_math 3241 :base_core :base_mem :base_orig :base_math :base_loop
2725 grepstart grepwhile mapstart mapwhile 3242 grepstart grepwhile mapstart mapwhile
2726 sort time 3243 sort time
2727)); 3244));
2728 3245
2729# here we export the classes and methods available to script code 3246# here we export the classes and methods available to script code
2731=pod 3248=pod
2732 3249
2733The following functions and methods are available within a safe environment: 3250The following functions and methods are available within a safe environment:
2734 3251
2735 cf::object 3252 cf::object
2736 contr pay_amount pay_player map x y force_find force_add 3253 contr pay_amount pay_player map x y force_find force_add destroy
2737 insert remove name archname title slaying race decrease_ob_nr 3254 insert remove name archname title slaying race decrease split
3255 value
2738 3256
2739 cf::object::player 3257 cf::object::player
2740 player 3258 player
2741 3259
2742 cf::player 3260 cf::player
2747 3265
2748=cut 3266=cut
2749 3267
2750for ( 3268for (
2751 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3269 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2752 insert remove inv name archname title slaying race 3270 insert remove inv nrof name archname title slaying race
2753 decrease_ob_nr)], 3271 decrease split destroy change_exp value msg lore send_msg)],
2754 ["cf::object::player" => qw(player)], 3272 ["cf::object::player" => qw(player)],
2755 ["cf::player" => qw(peaceful)], 3273 ["cf::player" => qw(peaceful send_msg)],
2756 ["cf::map" => qw(trigger)], 3274 ["cf::map" => qw(trigger)],
2757) { 3275) {
2758 no strict 'refs';
2759 my ($pkg, @funs) = @$_; 3276 my ($pkg, @funs) = @$_;
2760 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3277 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2761 for @funs; 3278 for @funs;
2762} 3279}
2763 3280
2778 3295
2779 my $qcode = $code; 3296 my $qcode = $code;
2780 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3297 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2781 $qcode =~ s/\n/\\n/g; 3298 $qcode =~ s/\n/\\n/g;
2782 3299
3300 %vars = (_dummy => 0) unless %vars;
3301
3302 my @res;
2783 local $_; 3303 local $_;
2784 local @safe::cf::_safe_eval_args = values %vars;
2785 3304
2786 my $eval = 3305 my $eval =
2787 "do {\n" 3306 "do {\n"
2788 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3307 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2789 . "#line 0 \"{$qcode}\"\n" 3308 . "#line 0 \"{$qcode}\"\n"
2790 . $code 3309 . $code
2791 . "\n}" 3310 . "\n}"
2792 ; 3311 ;
2793 3312
3313 if ($CFG{safe_eval}) {
2794 sub_generation_inc; 3314 sub_generation_inc;
3315 local @safe::cf::_safe_eval_args = values %vars;
2795 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3316 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2796 sub_generation_inc; 3317 sub_generation_inc;
3318 } else {
3319 local @cf::_safe_eval_args = values %vars;
3320 @res = wantarray ? eval eval : scalar eval $eval;
3321 }
2797 3322
2798 if ($@) { 3323 if ($@) {
2799 warn "$@"; 3324 warn "$@",
2800 warn "while executing safe code '$code'\n"; 3325 "while executing safe code '$code'\n",
2801 warn "with arguments " . (join " ", %vars) . "\n"; 3326 "with arguments " . (join " ", %vars) . "\n";
2802 } 3327 }
2803 3328
2804 wantarray ? @res : $res[0] 3329 wantarray ? @res : $res[0]
2805} 3330}
2806 3331
2820=cut 3345=cut
2821 3346
2822sub register_script_function { 3347sub register_script_function {
2823 my ($fun, $cb) = @_; 3348 my ($fun, $cb) = @_;
2824 3349
2825 no strict 'refs'; 3350 $fun = "safe::$fun" if $CFG{safe_eval};
2826 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3351 *$fun = $safe_hole->wrap ($cb);
2827} 3352}
2828 3353
2829=back 3354=back
2830 3355
2831=cut 3356=cut
2834# the server's init and main functions 3359# the server's init and main functions
2835 3360
2836sub load_facedata($) { 3361sub load_facedata($) {
2837 my ($path) = @_; 3362 my ($path) = @_;
2838 3363
3364 # HACK to clear player env face cache, we need some signal framework
3365 # for this (global event?)
3366 %ext::player_env::MUSIC_FACE_CACHE = ();
3367
2839 my $enc = JSON::XS->new->utf8->canonical; 3368 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2840 3369
2841 warn "loading facedata from $path\n"; 3370 trace "loading facedata from $path\n";
2842 3371
2843 my $facedata; 3372 my $facedata;
2844 0 < aio_load $path, $facedata 3373 0 < aio_load $path, $facedata
2845 or die "$path: $!"; 3374 or die "$path: $!";
2846 3375
2848 3377
2849 $facedata->{version} == 2 3378 $facedata->{version} == 2
2850 or cf::cleanup "$path: version mismatch, cannot proceed."; 3379 or cf::cleanup "$path: version mismatch, cannot proceed.";
2851 3380
2852 # patch in the exptable 3381 # patch in the exptable
3382 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2853 $facedata->{resource}{"res/exp_table"} = { 3383 $facedata->{resource}{"res/exp_table"} = {
2854 type => FT_RSRC, 3384 type => FT_RSRC,
2855 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3385 data => $exp_table,
3386 hash => (Digest::MD5::md5 $exp_table),
2856 }; 3387 };
2857 cf::cede_to_tick; 3388 cf::cede_to_tick;
2858 3389
2859 { 3390 {
2860 my $faces = $facedata->{faceinfo}; 3391 my $faces = $facedata->{faceinfo};
2861 3392
2862 while (my ($face, $info) = each %$faces) { 3393 while (my ($face, $info) = each %$faces) {
2863 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3394 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3395
2864 cf::face::set_visibility $idx, $info->{visibility}; 3396 cf::face::set_visibility $idx, $info->{visibility};
2865 cf::face::set_magicmap $idx, $info->{magicmap}; 3397 cf::face::set_magicmap $idx, $info->{magicmap};
2866 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3398 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2867 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3399 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2868 3400
2869 cf::cede_to_tick; 3401 cf::cede_to_tick;
2870 } 3402 }
2871 3403
2872 while (my ($face, $info) = each %$faces) { 3404 while (my ($face, $info) = each %$faces) {
2873 next unless $info->{smooth}; 3405 next unless $info->{smooth};
3406
2874 my $idx = cf::face::find $face 3407 my $idx = cf::face::find $face
2875 or next; 3408 or next;
3409
2876 if (my $smooth = cf::face::find $info->{smooth}) { 3410 if (my $smooth = cf::face::find $info->{smooth}) {
2877 cf::face::set_smooth $idx, $smooth; 3411 cf::face::set_smooth $idx, $smooth;
2878 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3412 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2879 } else { 3413 } else {
2880 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3414 error "smooth face '$info->{smooth}' not found for face '$face'";
2881 } 3415 }
2882 3416
2883 cf::cede_to_tick; 3417 cf::cede_to_tick;
2884 } 3418 }
2885 } 3419 }
2894 3428
2895 cf::anim::invalidate_all; # d'oh 3429 cf::anim::invalidate_all; # d'oh
2896 } 3430 }
2897 3431
2898 { 3432 {
2899 # TODO: for gcfclient pleasure, we should give resources
2900 # that gcfclient doesn't grok a >10000 face index.
2901 my $res = $facedata->{resource}; 3433 my $res = $facedata->{resource};
2902 3434
2903 my $soundconf = delete $res->{"res/sound.conf"};
2904
2905 while (my ($name, $info) = each %$res) { 3435 while (my ($name, $info) = each %$res) {
3436 if (defined $info->{type}) {
2906 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3437 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2907 my $data;
2908 3438
2909 if ($info->{type} & 1) { 3439 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2910 # prepend meta info 3440 cf::face::set_type $idx, $info->{type};
2911
2912 my $meta = $enc->encode ({
2913 name => $name,
2914 %{ $info->{meta} || {} },
2915 });
2916
2917 $data = pack "(w/a*)*", $meta, $info->{data};
2918 } else { 3441 } else {
2919 $data = $info->{data}; 3442 $RESOURCE{$name} = $info; # unused
2920 } 3443 }
2921 3444
2922 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2923 cf::face::set_type $idx, $info->{type};
2924
2925 cf::cede_to_tick; 3445 cf::cede_to_tick;
2926 } 3446 }
2927
2928 if ($soundconf) {
2929 $soundconf = $enc->decode (delete $soundconf->{data});
2930
2931 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2932 my $sound = $soundconf->{compat}[$_]
2933 or next;
2934
2935 my $face = cf::face::find "sound/$sound->[1]";
2936 cf::sound::set $sound->[0] => $face;
2937 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2938 }
2939
2940 while (my ($k, $v) = each %{$soundconf->{event}}) {
2941 my $face = cf::face::find "sound/$v";
2942 cf::sound::set $k => $face;
2943 }
2944 }
2945 } 3447 }
3448
3449 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2946 3450
2947 1 3451 1
2948} 3452}
2949 3453
2950register_exticmd fx_want => sub { 3454register_exticmd fx_want => sub {
2953 while (my ($k, $v) = each %$want) { 3457 while (my ($k, $v) = each %$want) {
2954 $ns->fx_want ($k, $v); 3458 $ns->fx_want ($k, $v);
2955 } 3459 }
2956}; 3460};
2957 3461
3462sub load_resource_file($) {
3463 my $guard = lock_acquire "load_resource_file";
3464
3465 my $status = load_resource_file_ $_[0];
3466 get_slot 0.1, 100;
3467 cf::arch::commit_load;
3468
3469 $status
3470}
3471
2958sub reload_regions { 3472sub reload_regions {
3473 # HACK to clear player env face cache, we need some signal framework
3474 # for this (global event?)
3475 %ext::player_env::MUSIC_FACE_CACHE = ();
3476
2959 load_resource_file "$MAPDIR/regions" 3477 load_resource_file "$MAPDIR/regions"
2960 or die "unable to load regions file\n"; 3478 or die "unable to load regions file\n";
2961 3479
2962 for (cf::region::list) { 3480 for (cf::region::list) {
2963 $_->{match} = qr/$_->{match}/ 3481 $_->{match} = qr/$_->{match}/
2971} 3489}
2972 3490
2973sub reload_archetypes { 3491sub reload_archetypes {
2974 load_resource_file "$DATADIR/archetypes" 3492 load_resource_file "$DATADIR/archetypes"
2975 or die "unable to load archetypes\n"; 3493 or die "unable to load archetypes\n";
2976 #d# NEED to laod twice to resolve forward references
2977 # this really needs to be done in an extra post-pass
2978 # (which needs to be synchronous, so solve it differently)
2979 load_resource_file "$DATADIR/archetypes"
2980 or die "unable to load archetypes\n";
2981} 3494}
2982 3495
2983sub reload_treasures { 3496sub reload_treasures {
2984 load_resource_file "$DATADIR/treasures" 3497 load_resource_file "$DATADIR/treasures"
2985 or die "unable to load treasurelists\n"; 3498 or die "unable to load treasurelists\n";
2986} 3499}
2987 3500
3501sub reload_sound {
3502 trace "loading sound config from $DATADIR/sound\n";
3503
3504 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3505 or die "$DATADIR/sound $!";
3506
3507 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3508
3509 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3510 my $sound = $soundconf->{compat}[$_]
3511 or next;
3512
3513 my $face = cf::face::find "sound/$sound->[1]";
3514 cf::sound::set $sound->[0] => $face;
3515 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3516 }
3517
3518 while (my ($k, $v) = each %{$soundconf->{event}}) {
3519 my $face = cf::face::find "sound/$v";
3520 cf::sound::set $k => $face;
3521 }
3522}
3523
2988sub reload_resources { 3524sub reload_resources {
2989 warn "reloading resource files...\n"; 3525 trace "reloading resource files...\n";
2990 3526
3527 reload_facedata;
3528 reload_sound;
3529 reload_archetypes;
2991 reload_regions; 3530 reload_regions;
2992 reload_facedata;
2993 #reload_archetypes;#d#
2994 reload_archetypes;
2995 reload_treasures; 3531 reload_treasures;
2996 3532
2997 warn "finished reloading resource files\n"; 3533 trace "finished reloading resource files\n";
2998} 3534}
2999 3535
3000sub init { 3536sub reload_config {
3001 reload_resources; 3537 trace "reloading config file...\n";
3002}
3003 3538
3004sub cfg_load {
3005 open my $fh, "<:utf8", "$CONFDIR/config" 3539 open my $fh, "<:utf8", "$CONFDIR/config"
3006 or return; 3540 or return;
3007 3541
3008 local $/; 3542 local $/;
3009 *CFG = YAML::Syck::Load <$fh>; 3543 *CFG = YAML::XS::Load scalar <$fh>;
3010 3544
3011 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3545 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3012 3546
3013 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3547 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3014 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3548 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3015 3549
3016 if (exists $CFG{mlockall}) { 3550 if (exists $CFG{mlockall}) {
3018 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3552 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3019 and die "WARNING: m(un)lockall failed: $!\n"; 3553 and die "WARNING: m(un)lockall failed: $!\n";
3020 }; 3554 };
3021 warn $@ if $@; 3555 warn $@ if $@;
3022 } 3556 }
3557
3558 trace "finished reloading resource files\n";
3559}
3560
3561sub pidfile() {
3562 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3563 or die "$PIDFILE: $!";
3564 flock $fh, &Fcntl::LOCK_EX
3565 or die "$PIDFILE: flock: $!";
3566 $fh
3567}
3568
3569# make sure only one server instance is running at any one time
3570sub atomic {
3571 my $fh = pidfile;
3572
3573 my $pid = <$fh>;
3574 kill 9, $pid if $pid > 0;
3575
3576 seek $fh, 0, 0;
3577 print $fh $$;
3578}
3579
3580sub main_loop {
3581 trace "EV::loop starting\n";
3582 if (1) {
3583 EV::loop;
3584 }
3585 trace "EV::loop returned\n";
3586 goto &main_loop unless $REALLY_UNLOOP;
3023} 3587}
3024 3588
3025sub main { 3589sub main {
3590 cf::init_globals; # initialise logging
3591
3592 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3593 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3594 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3595 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3596
3597 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3598
3026 # we must not ever block the main coroutine 3599 # we must not ever block the main coroutine
3027 local $Coro::idle = sub { 3600 local $Coro::idle = sub {
3028 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3601 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3029 (async { 3602 (async {
3030 Event::one_event; 3603 $Coro::current->{desc} = "IDLE BUG HANDLER";
3604 EV::loop EV::LOOP_ONESHOT;
3031 })->prio (Coro::PRIO_MAX); 3605 })->prio (Coro::PRIO_MAX);
3032 }; 3606 };
3033 3607
3034 cfg_load; 3608 evthread_start IO::AIO::poll_fileno;
3609
3610 cf::sync_job {
3611 cf::init_experience;
3612 cf::init_anim;
3613 cf::init_attackmess;
3614 cf::init_dynamic;
3615
3616 cf::load_settings;
3617 cf::load_materials;
3618
3619 reload_resources;
3620 reload_config;
3035 db_init; 3621 db_init;
3622
3623 cf::init_uuid;
3624 cf::init_signals;
3625 cf::init_skills;
3626
3627 cf::init_beforeplay;
3628
3629 atomic;
3630
3036 load_extensions; 3631 load_extensions;
3037 3632
3038 $TICK_WATCHER->start; 3633 utime time, time, $RUNTIMEFILE;
3039 Event::loop; 3634
3635 # no (long-running) fork's whatsoever before this point(!)
3636 use POSIX ();
3637 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3638
3639 (pop @POST_INIT)->(0) while @POST_INIT;
3640 };
3641
3642 cf::object::thawer::errors_are_fatal 0;
3643 info "parse errors in files are no longer fatal from this point on.\n";
3644
3645 main_loop;
3040} 3646}
3041 3647
3042############################################################################# 3648#############################################################################
3043# initialisation and cleanup 3649# initialisation and cleanup
3044 3650
3045# install some emergency cleanup handlers 3651# install some emergency cleanup handlers
3046BEGIN { 3652BEGIN {
3653 our %SIGWATCHER = ();
3047 for my $signal (qw(INT HUP TERM)) { 3654 for my $signal (qw(INT HUP TERM)) {
3048 Event->signal ( 3655 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3049 reentrant => 0,
3050 data => WF_AUTOCANCEL,
3051 signal => $signal,
3052 prio => 0,
3053 cb => sub {
3054 cf::cleanup "SIG$signal"; 3656 cf::cleanup "SIG$signal";
3055 },
3056 ); 3657 };
3057 } 3658 }
3058} 3659}
3059 3660
3060sub write_runtime { 3661sub write_runtime_sync {
3061 my $runtime = "$LOCALDIR/runtime"; 3662 my $t0 = AE::time;
3062 3663
3063 # first touch the runtime file to show we are still running: 3664 # first touch the runtime file to show we are still running:
3064 # the fsync below can take a very very long time. 3665 # the fsync below can take a very very long time.
3065 3666
3066 IO::AIO::aio_utime $runtime, undef, undef; 3667 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3067 3668
3068 my $guard = cf::lock_acquire "write_runtime"; 3669 my $guard = cf::lock_acquire "write_runtime";
3069 3670
3070 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3671 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3071 or return; 3672 or return;
3072 3673
3073 my $value = $cf::RUNTIME + 90 + 10; 3674 my $value = $cf::RUNTIME + 90 + 10;
3074 # 10 is the runtime save interval, for a monotonic clock 3675 # 10 is the runtime save interval, for a monotonic clock
3075 # 60 allows for the watchdog to kill the server. 3676 # 60 allows for the watchdog to kill the server.
3085 aio_utime $fh, undef, undef; 3686 aio_utime $fh, undef, undef;
3086 3687
3087 close $fh 3688 close $fh
3088 or return; 3689 or return;
3089 3690
3090 aio_rename "$runtime~", $runtime 3691 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3091 and return; 3692 and return;
3092 3693
3093 warn "runtime file written.\n"; 3694 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3094 3695
3095 1 3696 1
3697}
3698
3699our $uuid_lock;
3700our $uuid_skip;
3701
3702sub write_uuid_sync($) {
3703 $uuid_skip ||= $_[0];
3704
3705 return if $uuid_lock;
3706 local $uuid_lock = 1;
3707
3708 my $uuid = "$LOCALDIR/uuid";
3709
3710 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3711 or return;
3712
3713 my $value = uuid_seq uuid_cur;
3714
3715 unless ($value) {
3716 info "cowardly refusing to write zero uuid value!\n";
3717 return;
3718 }
3719
3720 my $value = uuid_str $value + $uuid_skip;
3721 $uuid_skip = 0;
3722
3723 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3724 and return;
3725
3726 # always fsync - this file is important
3727 aio_fsync $fh
3728 and return;
3729
3730 close $fh
3731 or return;
3732
3733 aio_rename "$uuid~", $uuid
3734 and return;
3735
3736 trace "uuid file written ($value).\n";
3737
3738 1
3739
3740}
3741
3742sub write_uuid($$) {
3743 my ($skip, $sync) = @_;
3744
3745 $sync ? write_uuid_sync $skip
3746 : async { write_uuid_sync $skip };
3096} 3747}
3097 3748
3098sub emergency_save() { 3749sub emergency_save() {
3099 my $freeze_guard = cf::freeze_mainloop; 3750 my $freeze_guard = cf::freeze_mainloop;
3100 3751
3101 warn "enter emergency perl save\n"; 3752 info "emergency_perl_save: enter\n";
3753
3754 # this is a trade-off: we want to be very quick here, so
3755 # save all maps without fsync, and later call a global sync
3756 # (which in turn might be very very slow)
3757 local $USE_FSYNC = 0;
3102 3758
3103 cf::sync_job { 3759 cf::sync_job {
3760 cf::write_runtime_sync; # external watchdog should not bark
3761
3104 # use a peculiar iteration method to avoid tripping on perl 3762 # use a peculiar iteration method to avoid tripping on perl
3105 # refcount bugs in for. also avoids problems with players 3763 # refcount bugs in for. also avoids problems with players
3106 # and maps saved/destroyed asynchronously. 3764 # and maps saved/destroyed asynchronously.
3107 warn "begin emergency player save\n"; 3765 info "emergency_perl_save: begin player save\n";
3108 for my $login (keys %cf::PLAYER) { 3766 for my $login (keys %cf::PLAYER) {
3109 my $pl = $cf::PLAYER{$login} or next; 3767 my $pl = $cf::PLAYER{$login} or next;
3110 $pl->valid or next; 3768 $pl->valid or next;
3769 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3111 $pl->save; 3770 $pl->save;
3112 } 3771 }
3113 warn "end emergency player save\n"; 3772 info "emergency_perl_save: end player save\n";
3114 3773
3115 warn "begin emergency map save\n"; 3774 cf::write_runtime_sync; # external watchdog should not bark
3775
3776 info "emergency_perl_save: begin map save\n";
3116 for my $path (keys %cf::MAP) { 3777 for my $path (keys %cf::MAP) {
3117 my $map = $cf::MAP{$path} or next; 3778 my $map = $cf::MAP{$path} or next;
3118 $map->valid or next; 3779 $map->valid or next;
3119 $map->save; 3780 $map->save;
3120 } 3781 }
3121 warn "end emergency map save\n"; 3782 info "emergency_perl_save: end map save\n";
3122 3783
3123 warn "begin emergency database checkpoint\n"; 3784 cf::write_runtime_sync; # external watchdog should not bark
3785
3786 info "emergency_perl_save: begin database checkpoint\n";
3124 BDB::db_env_txn_checkpoint $DB_ENV; 3787 BDB::db_env_txn_checkpoint $DB_ENV;
3125 warn "end emergency database checkpoint\n"; 3788 info "emergency_perl_save: end database checkpoint\n";
3789
3790 info "emergency_perl_save: begin write uuid\n";
3791 write_uuid_sync 1;
3792 info "emergency_perl_save: end write uuid\n";
3793
3794 cf::write_runtime_sync; # external watchdog should not bark
3795
3796 trace "emergency_perl_save: syncing database to disk";
3797 BDB::db_env_txn_checkpoint $DB_ENV;
3798
3799 info "emergency_perl_save: starting sync\n";
3800 IO::AIO::aio_sync sub {
3801 info "emergency_perl_save: finished sync\n";
3802 };
3803
3804 cf::write_runtime_sync; # external watchdog should not bark
3805
3806 trace "emergency_perl_save: flushing outstanding aio requests";
3807 while (IO::AIO::nreqs || BDB::nreqs) {
3808 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3809 }
3810
3811 cf::write_runtime_sync; # external watchdog should not bark
3126 }; 3812 };
3127 3813
3128 warn "leave emergency perl save\n"; 3814 info "emergency_perl_save: leave\n";
3129} 3815}
3130 3816
3131sub post_cleanup { 3817sub post_cleanup {
3132 my ($make_core) = @_; 3818 my ($make_core) = @_;
3133 3819
3820 IO::AIO::flush;
3821
3134 warn Carp::longmess "post_cleanup backtrace" 3822 error Carp::longmess "post_cleanup backtrace"
3135 if $make_core; 3823 if $make_core;
3824
3825 my $fh = pidfile;
3826 unlink $PIDFILE if <$fh> == $$;
3827}
3828
3829# a safer delete_package, copied from Symbol
3830sub clear_package($) {
3831 my $pkg = shift;
3832
3833 # expand to full symbol table name if needed
3834 unless ($pkg =~ /^main::.*::$/) {
3835 $pkg = "main$pkg" if $pkg =~ /^::/;
3836 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3837 $pkg .= '::' unless $pkg =~ /::$/;
3838 }
3839
3840 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3841 my $stem_symtab = *{$stem}{HASH};
3842
3843 defined $stem_symtab and exists $stem_symtab->{$leaf}
3844 or return;
3845
3846 # clear all symbols
3847 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3848 for my $name (keys %$leaf_symtab) {
3849 _gv_clear *{"$pkg$name"};
3850# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3851 }
3136} 3852}
3137 3853
3138sub do_reload_perl() { 3854sub do_reload_perl() {
3139 # can/must only be called in main 3855 # can/must only be called in main
3140 if ($Coro::current != $Coro::main) { 3856 if (in_main) {
3141 warn "can only reload from main coroutine"; 3857 error "can only reload from main coroutine";
3142 return; 3858 return;
3143 } 3859 }
3144 3860
3861 return if $RELOAD++;
3862
3863 my $t1 = AE::time;
3864
3865 while ($RELOAD) {
3145 warn "reloading..."; 3866 info "reloading...";
3146 3867
3147 warn "entering sync_job"; 3868 trace "entering sync_job";
3148 3869
3149 cf::sync_job { 3870 cf::sync_job {
3150 cf::write_runtime; # external watchdog should not bark
3151 cf::emergency_save; 3871 cf::emergency_save;
3152 cf::write_runtime; # external watchdog should not bark
3153 3872
3154 warn "syncing database to disk";
3155 BDB::db_env_txn_checkpoint $DB_ENV;
3156
3157 # if anything goes wrong in here, we should simply crash as we already saved
3158
3159 warn "cancelling all WF_AUTOCANCEL watchers";
3160 for (Event::all_watchers) {
3161 $_->cancel if $_->data & WF_AUTOCANCEL;
3162 }
3163
3164 warn "flushing outstanding aio requests";
3165 for (;;) {
3166 BDB::flush;
3167 IO::AIO::flush;
3168 Coro::cede;
3169 last unless IO::AIO::nreqs || BDB::nreqs;
3170 warn "iterate...";
3171 }
3172
3173 ++$RELOAD;
3174
3175 warn "cancelling all extension coros"; 3873 trace "cancelling all extension coros";
3176 $_->cancel for values %EXT_CORO; 3874 $_->cancel for values %EXT_CORO;
3177 %EXT_CORO = (); 3875 %EXT_CORO = ();
3178 3876
3179 warn "removing commands"; 3877 trace "removing commands";
3180 %COMMAND = (); 3878 %COMMAND = ();
3181 3879
3182 warn "removing ext/exti commands"; 3880 trace "removing ext/exti commands";
3183 %EXTCMD = (); 3881 %EXTCMD = ();
3184 %EXTICMD = (); 3882 %EXTICMD = ();
3185 3883
3186 warn "unloading/nuking all extensions"; 3884 trace "unloading/nuking all extensions";
3187 for my $pkg (@EXTS) { 3885 for my $pkg (@EXTS) {
3188 warn "... unloading $pkg"; 3886 trace "... unloading $pkg";
3189 3887
3190 if (my $cb = $pkg->can ("unload")) { 3888 if (my $cb = $pkg->can ("unload")) {
3191 eval { 3889 eval {
3192 $cb->($pkg); 3890 $cb->($pkg);
3193 1 3891 1
3194 } or warn "$pkg unloaded, but with errors: $@"; 3892 } or error "$pkg unloaded, but with errors: $@";
3893 }
3894
3895 trace "... clearing $pkg";
3896 clear_package $pkg;
3195 } 3897 }
3196 3898
3197 warn "... nuking $pkg";
3198 Symbol::delete_package $pkg;
3199 }
3200
3201 warn "unloading all perl modules loaded from $LIBDIR"; 3899 trace "unloading all perl modules loaded from $LIBDIR";
3202 while (my ($k, $v) = each %INC) { 3900 while (my ($k, $v) = each %INC) {
3203 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3901 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3204 3902
3205 warn "... unloading $k"; 3903 trace "... unloading $k";
3206 delete $INC{$k}; 3904 delete $INC{$k};
3207 3905
3208 $k =~ s/\.pm$//; 3906 $k =~ s/\.pm$//;
3209 $k =~ s/\//::/g; 3907 $k =~ s/\//::/g;
3210 3908
3211 if (my $cb = $k->can ("unload_module")) { 3909 if (my $cb = $k->can ("unload_module")) {
3212 $cb->(); 3910 $cb->();
3911 }
3912
3913 clear_package $k;
3213 } 3914 }
3214 3915
3215 Symbol::delete_package $k;
3216 }
3217
3218 warn "getting rid of safe::, as good as possible"; 3916 trace "getting rid of safe::, as good as possible";
3219 Symbol::delete_package "safe::$_" 3917 clear_package "safe::$_"
3220 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3918 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3221 3919
3222 warn "unloading cf.pm \"a bit\""; 3920 trace "unloading cf.pm \"a bit\"";
3223 delete $INC{"cf.pm"}; 3921 delete $INC{"cf.pm"};
3224 delete $INC{"cf/pod.pm"}; 3922 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3225 3923
3226 # don't, removes xs symbols, too, 3924 # don't, removes xs symbols, too,
3227 # and global variables created in xs 3925 # and global variables created in xs
3228 #Symbol::delete_package __PACKAGE__; 3926 #clear_package __PACKAGE__;
3229 3927
3230 warn "unload completed, starting to reload now"; 3928 info "unload completed, starting to reload now";
3231 3929
3232 warn "reloading cf.pm"; 3930 trace "reloading cf.pm";
3233 require cf; 3931 require cf;
3234 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3932 cf::_connect_to_perl_1;
3235 3933
3236 warn "loading config and database again"; 3934 trace "loading config and database again";
3237 cf::cfg_load; 3935 cf::reload_config;
3238 3936
3239 warn "loading extensions"; 3937 trace "loading extensions";
3240 cf::load_extensions; 3938 cf::load_extensions;
3241 3939
3940 if ($REATTACH_ON_RELOAD) {
3242 warn "reattaching attachments to objects/players"; 3941 trace "reattaching attachments to objects/players";
3243 _global_reattach; # objects, sockets 3942 _global_reattach; # objects, sockets
3244 warn "reattaching attachments to maps"; 3943 trace "reattaching attachments to maps";
3245 reattach $_ for values %MAP; 3944 reattach $_ for values %MAP;
3246 warn "reattaching attachments to players"; 3945 trace "reattaching attachments to players";
3247 reattach $_ for values %PLAYER; 3946 reattach $_ for values %PLAYER;
3947 }
3248 3948
3949 trace "running post_init jobs";
3950 (pop @POST_INIT)->(1) while @POST_INIT;
3951
3249 warn "leaving sync_job"; 3952 trace "leaving sync_job";
3250 3953
3251 1 3954 1
3252 } or do { 3955 } or do {
3253 warn $@; 3956 error $@;
3254 warn "error while reloading, exiting."; 3957 cf::cleanup "error while reloading, exiting.";
3255 exit 1; 3958 };
3959
3960 info "reloaded";
3961 --$RELOAD;
3256 }; 3962 }
3257 3963
3258 warn "reloaded"; 3964 $t1 = AE::time - $t1;
3965 info "reload completed in ${t1}s\n";
3259}; 3966};
3260 3967
3261our $RELOAD_WATCHER; # used only during reload 3968our $RELOAD_WATCHER; # used only during reload
3262 3969
3263sub reload_perl() { 3970sub reload_perl() {
3264 # doing reload synchronously and two reloads happen back-to-back, 3971 # doing reload synchronously and two reloads happen back-to-back,
3265 # coro crashes during coro_state_free->destroy here. 3972 # coro crashes during coro_state_free->destroy here.
3266 3973
3267 $RELOAD_WATCHER ||= Event->timer ( 3974 $RELOAD_WATCHER ||= cf::async {
3268 reentrant => 0, 3975 Coro::AIO::aio_wait cache_extensions;
3269 after => 0, 3976
3270 data => WF_AUTOCANCEL, 3977 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3271 cb => sub {
3272 do_reload_perl; 3978 do_reload_perl;
3273 undef $RELOAD_WATCHER; 3979 undef $RELOAD_WATCHER;
3274 }, 3980 };
3275 ); 3981 };
3276} 3982}
3277 3983
3278register_command "reload" => sub { 3984register_command "reload" => sub {
3279 my ($who, $arg) = @_; 3985 my ($who, $arg) = @_;
3280 3986
3281 if ($who->flag (FLAG_WIZ)) { 3987 if ($who->flag (FLAG_WIZ)) {
3282 $who->message ("reloading server."); 3988 $who->message ("reloading server.");
3989 async {
3990 $Coro::current->{desc} = "perl_reload";
3283 async { reload_perl }; 3991 reload_perl;
3992 };
3284 } 3993 }
3285}; 3994};
3286 3995
3287unshift @INC, $LIBDIR; 3996unshift @INC, $LIBDIR;
3288 3997
3290 3999
3291our @WAIT_FOR_TICK; 4000our @WAIT_FOR_TICK;
3292our @WAIT_FOR_TICK_BEGIN; 4001our @WAIT_FOR_TICK_BEGIN;
3293 4002
3294sub wait_for_tick { 4003sub wait_for_tick {
3295 return unless $TICK_WATCHER->is_active;
3296 return if $Coro::current == $Coro::main; 4004 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3297 4005
3298 my $signal = new Coro::Signal; 4006 my $signal = new Coro::Signal;
3299 push @WAIT_FOR_TICK, $signal; 4007 push @WAIT_FOR_TICK, $signal;
3300 $signal->wait; 4008 $signal->wait;
3301} 4009}
3302 4010
3303sub wait_for_tick_begin { 4011sub wait_for_tick_begin {
3304 return unless $TICK_WATCHER->is_active;
3305 return if $Coro::current == $Coro::main; 4012 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3306 4013
3307 my $signal = new Coro::Signal; 4014 my $signal = new Coro::Signal;
3308 push @WAIT_FOR_TICK_BEGIN, $signal; 4015 push @WAIT_FOR_TICK_BEGIN, $signal;
3309 $signal->wait; 4016 $signal->wait;
3310} 4017}
3311 4018
3312 my $min = 1e6;#d# 4019sub tick {
3313 my $avg = 10;
3314$TICK_WATCHER = Event->timer (
3315 reentrant => 0,
3316 parked => 1,
3317 prio => 0,
3318 at => $NEXT_TICK || $TICK,
3319 data => WF_AUTOCANCEL,
3320 cb => sub {
3321 if ($Coro::current != $Coro::main) { 4020 if ($Coro::current != $Coro::main) {
3322 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4021 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3323 unless ++$bug_warning > 10; 4022 unless ++$bug_warning > 10;
3324 return; 4023 return;
3325 } 4024 }
3326 4025
3327 $NOW = $tick_start = Event::time;
3328
3329 cf::server_tick; # one server iteration 4026 cf::server_tick; # one server iteration
3330 4027
3331 0 && sync_job {#d# 4028 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3332 for(1..10) {
3333 my $t = Event::time;
3334 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3335 or die;
3336 4029
3337 $map->width (50); 4030 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3338 $map->height (50); 4031 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3339 $map->alloc; 4032 Coro::async_pool {
3340 $map->_load_objects ("/tmp/x.map", 1); 4033 $Coro::current->{desc} = "runtime saver";
3341 my $t = Event::time - $t; 4034 write_runtime_sync
3342 4035 or error "ERROR: unable to write runtime file: $!";
3343 #next unless $t < 0.0013;#d#
3344 if ($t < $min) {
3345 $min = $t;
3346 }
3347 $avg = $avg * 0.99 + $t * 0.01;
3348 }
3349 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3350 exit 0;
3351 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3352 }; 4036 };
4037 }
3353 4038
3354 $RUNTIME += $TICK;
3355 $NEXT_TICK += $TICK;
3356
3357 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3358 $NEXT_RUNTIME_WRITE = $NOW + 10;
3359 Coro::async_pool {
3360 write_runtime
3361 or warn "ERROR: unable to write runtime file: $!";
3362 };
3363 }
3364
3365# my $AFTER = Event::time;
3366# warn $AFTER - $NOW;#d#
3367
3368 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4039 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3369 $sig->send; 4040 $sig->send;
3370 } 4041 }
3371 while (my $sig = shift @WAIT_FOR_TICK) { 4042 while (my $sig = shift @WAIT_FOR_TICK) {
3372 $sig->send; 4043 $sig->send;
3373 } 4044 }
3374 4045
3375 $NOW = Event::time; 4046 $LOAD = ($NOW - $TICK_START) / $TICK;
3376
3377 # if we are delayed by four ticks or more, skip them all
3378 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3379
3380 $TICK_WATCHER->at ($NEXT_TICK);
3381 $TICK_WATCHER->start;
3382
3383 $LOAD = ($NOW - $tick_start) / $TICK;
3384 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4047 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3385 4048
3386 _post_tick; 4049 if (0) {
3387 4050 if ($NEXT_TICK) {
3388 4051 my $jitter = $TICK_START - $NEXT_TICK;
4052 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4053 debug "jitter $JITTER\n";#d#
4054 }
3389 }, 4055 }
3390); 4056}
3391 4057
3392{ 4058{
3393 BDB::max_poll_time $TICK * 0.1; 4059 # configure BDB
3394 $BDB_POLL_WATCHER = Event->io ( 4060
3395 reentrant => 0,
3396 fd => BDB::poll_fileno,
3397 poll => 'r',
3398 prio => 0,
3399 data => WF_AUTOCANCEL,
3400 cb => \&BDB::poll_cb,
3401 );
3402 BDB::min_parallel 8; 4061 BDB::min_parallel 16;
3403 4062 BDB::max_poll_reqs $TICK * 0.1;
3404 BDB::set_sync_prepare { 4063 $AnyEvent::BDB::WATCHER->priority (1);
3405 my $status;
3406 my $current = $Coro::current;
3407 (
3408 sub {
3409 $status = $!;
3410 $current->ready; undef $current;
3411 },
3412 sub {
3413 Coro::schedule while defined $current;
3414 $! = $status;
3415 },
3416 )
3417 };
3418 4064
3419 unless ($DB_ENV) { 4065 unless ($DB_ENV) {
3420 $DB_ENV = BDB::db_env_create; 4066 $DB_ENV = BDB::db_env_create;
4067 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4068 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4069 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4070 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4071 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3421 4072
3422 cf::sync_job { 4073 cf::sync_job {
3423 eval { 4074 eval {
3424 BDB::db_env_open 4075 BDB::db_env_open
3425 $DB_ENV, 4076 $DB_ENV,
3427 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4078 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3428 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4079 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3429 0666; 4080 0666;
3430 4081
3431 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4082 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3432
3433 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3434 $DB_ENV->set_lk_detect;
3435 }; 4083 };
3436 4084
3437 cf::cleanup "db_env_open(db): $@" if $@; 4085 cf::cleanup "db_env_open(db): $@" if $@;
3438 }; 4086 };
3439 } 4087 }
4088
4089 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4090 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4091 };
4092 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4093 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4094 };
4095 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4096 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4097 };
3440} 4098}
3441 4099
3442{ 4100{
4101 # configure IO::AIO
4102
3443 IO::AIO::min_parallel 8; 4103 IO::AIO::min_parallel 8;
3444
3445 undef $Coro::AIO::WATCHER;
3446 IO::AIO::max_poll_time $TICK * 0.1; 4104 IO::AIO::max_poll_time $TICK * 0.1;
3447 $AIO_POLL_WATCHER = Event->io ( 4105 undef $AnyEvent::AIO::WATCHER;
3448 reentrant => 0,
3449 data => WF_AUTOCANCEL,
3450 fd => IO::AIO::poll_fileno,
3451 poll => 'r',
3452 prio => 6,
3453 cb => \&IO::AIO::poll_cb,
3454 );
3455} 4106}
3456 4107
3457my $_log_backtrace; 4108my $_log_backtrace;
3458 4109
3459sub _log_backtrace { 4110sub _log_backtrace {
3462 $msg =~ s/\n//; 4113 $msg =~ s/\n//;
3463 4114
3464 # limit the # of concurrent backtraces 4115 # limit the # of concurrent backtraces
3465 if ($_log_backtrace < 2) { 4116 if ($_log_backtrace < 2) {
3466 ++$_log_backtrace; 4117 ++$_log_backtrace;
4118 my $perl_bt = Carp::longmess $msg;
3467 async { 4119 async {
4120 $Coro::current->{desc} = "abt $msg";
4121
3468 my @bt = fork_call { 4122 my @bt = fork_call {
3469 @addr = map { sprintf "%x", $_ } @addr; 4123 @addr = map { sprintf "%x", $_ } @addr;
3470 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4124 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3471 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4125 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3472 or die "addr2line: $!"; 4126 or die "addr2line: $!";
3480 } 4134 }
3481 4135
3482 @funcs 4136 @funcs
3483 }; 4137 };
3484 4138
3485 LOG llevInfo, "[ABT] $msg\n"; 4139 LOG llevInfo, "[ABT] $perl_bt\n";
4140 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3486 LOG llevInfo, "[ABT] $_\n" for @bt; 4141 LOG llevInfo, "[ABT] $_\n" for @bt;
3487 --$_log_backtrace; 4142 --$_log_backtrace;
3488 }; 4143 };
3489 } else { 4144 } else {
3490 LOG llevInfo, "[ABT] $msg\n"; 4145 LOG llevInfo, "[ABT] $msg\n";
3491 LOG llevInfo, "[ABT] [suppressed]\n"; 4146 LOG llevInfo, "[ABT] [suppressed]\n";
3492 } 4147 }
3493} 4148}
3494 4149
3495# load additional modules 4150# load additional modules
3496use cf::pod; 4151require "cf/$_.pm" for @EXTRA_MODULES;
4152cf::_connect_to_perl_2;
3497 4153
3498END { cf::emergency_save } 4154END { cf::emergency_save }
3499 4155
35001 41561
3501 4157

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines