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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines