ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.331 by root, Mon Aug 13 13:10:01 2007 UTC vs.
Revision 1.482 by root, Sun Oct 11 05:31:54 2009 UTC

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

Diff Legend

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