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.539 by root, Tue May 4 22:49:21 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines