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.139 by root, Fri Jan 5 19:12:03 2007 UTC vs.
Revision 1.160 by root, Wed Jan 10 22:54:06 2007 UTC

15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 35
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
37our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
38 42
39our @EVENT; 43our @EVENT;
40our $LIBDIR = datadir . "/ext"; 44our $LIBDIR = datadir . "/ext";
41 45
42our $TICK = MAX_TIME * 1e-6; 46our $TICK = MAX_TIME * 1e-6;
47our %CFG; 51our %CFG;
48 52
49our $UPTIME; $UPTIME ||= time; 53our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 54our $RUNTIME;
51 55
56our %PLAYER; # all users
52our %MAP; # all maps 57our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 58our $LINK_MAP; # the special {link} map
54our $RANDOM_MAPS = cf::localdir . "/random"; 59our $RANDOM_MAPS = cf::localdir . "/random";
55our %EXT_CORO; 60
61our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
62our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
56 63
57binmode STDOUT; 64binmode STDOUT;
58binmode STDERR; 65binmode STDERR;
59 66
60# read virtual server time, if available 67# read virtual server time, if available
105=item %cf::CFG 112=item %cf::CFG
106 113
107Configuration for the server, loaded from C</etc/crossfire/config>, or 114Configuration for the server, loaded from C</etc/crossfire/config>, or
108from wherever your confdir points to. 115from wherever your confdir points to.
109 116
117=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
118
119These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
120or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
121processing has been done. Call C<< ->wait >> on them to maximise the
122window of cpu time available, or simply to synchronise to the server tick.
123
110=back 124=back
111 125
112=cut 126=cut
113 127
114BEGIN { 128BEGIN {
117 utf8::encode $msg; 131 utf8::encode $msg;
118 132
119 $msg .= "\n" 133 $msg .= "\n"
120 unless $msg =~ /\n$/; 134 unless $msg =~ /\n$/;
121 135
122 LOG llevError, "cfperl: $msg"; 136 LOG llevError, $msg;
123 }; 137 };
124} 138}
125 139
126@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 140@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 141@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
145 159
146$Event::DIED = sub { 160$Event::DIED = sub {
147 warn "error in event callback: @_"; 161 warn "error in event callback: @_";
148}; 162};
149 163
150my %ext_pkg;
151my @exts;
152my @hook;
153
154=head2 UTILITY FUNCTIONS 164=head2 UTILITY FUNCTIONS
155 165
156=over 4 166=over 4
157 167
168=item dumpval $ref
169
158=cut 170=cut
171
172sub dumpval {
173 eval {
174 local $SIG{__DIE__};
175 my $d;
176 if (1) {
177 $d = new Data::Dumper([$_[0]], ["*var"]);
178 $d->Terse(1);
179 $d->Indent(2);
180 $d->Quotekeys(0);
181 $d->Useqq(1);
182 #$d->Bless(...);
183 $d->Seen($_[1]) if @_ > 1;
184 $d = $d->Dump();
185 }
186 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
187 $d
188 } || "[unable to dump $_[0]: '$@']";
189}
159 190
160use JSON::Syck (); # TODO# replace by JSON::PC once working 191use JSON::Syck (); # TODO# replace by JSON::PC once working
161 192
162=item $ref = cf::from_json $json 193=item $ref = cf::from_json $json
163 194
228 259
229 my $guard = Coro::guard { $TICK_WATCHER->start }; 260 my $guard = Coro::guard { $TICK_WATCHER->start };
230 $TICK_WATCHER->stop; 261 $TICK_WATCHER->stop;
231 $guard 262 $guard
232} 263}
264
265=item cf::async { BLOCK }
266
267Currently the same as Coro::async_pool, meaning you cannot use
268C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
269thing you are allowed to do is call C<prio> on it.
270
271=cut
272
273BEGIN { *async = \&Coro::async_pool }
233 274
234=item cf::sync_job { BLOCK } 275=item cf::sync_job { BLOCK }
235 276
236The design of crossfire+ requires that the main coro ($Coro::main) is 277The design of crossfire+ requires that the main coro ($Coro::main) is
237always able to handle events or runnable, as crossfire+ is only partly 278always able to handle events or runnable, as crossfire+ is only partly
256 my $freeze_guard = freeze_mainloop; 297 my $freeze_guard = freeze_mainloop;
257 298
258 my $busy = 1; 299 my $busy = 1;
259 my @res; 300 my @res;
260 301
261 (Coro::async_pool { 302 (async {
262 @res = eval { $job->() }; 303 @res = eval { $job->() };
263 warn $@ if $@; 304 warn $@ if $@;
264 undef $busy; 305 undef $busy;
265 })->prio (Coro::PRIO_MAX); 306 })->prio (Coro::PRIO_MAX);
266 307
267 while ($busy) { 308 while ($busy) {
268 unless (Coro::cede) { 309 Coro::cede or Event::one_event;
269 Coro::nready ? Event::one_event 0 : Event::one_event;
270 Coro::cede_notself unless Coro::cede;
271 }
272 } 310 }
273 311
274 wantarray ? @res : $res[0] 312 wantarray ? @res : $res[0]
275 } else { 313 } else {
276 # we are in another coroutine, how wonderful, everything just works 314 # we are in another coroutine, how wonderful, everything just works
277 315
278 $job->() 316 $job->()
279 } 317 }
280} 318}
281 319
282=item $coro = cf::coro { BLOCK } 320=item $coro = cf::async_ext { BLOCK }
283 321
284Creates (and readies) and returns a new coro. This coro is automcatially 322Like async, but this coro is automatically being canceled when the
285being canceled when the extension calling this is being unloaded. 323extension calling this is being unloaded.
286 324
287=cut 325=cut
288 326
289sub coro(&) { 327sub async_ext(&) {
290 my $cb = shift; 328 my $cb = shift;
291 329
292 my $coro = &Coro::async_pool ($cb); 330 my $coro = &Coro::async ($cb);
293 331
294 $coro->on_destroy (sub { 332 $coro->on_destroy (sub {
295 delete $EXT_CORO{$coro+0}; 333 delete $EXT_CORO{$coro+0};
296 }); 334 });
297 $EXT_CORO{$coro+0} = $coro; 335 $EXT_CORO{$coro+0} = $coro;
326=cut 364=cut
327 365
328############################################################################# 366#############################################################################
329 367
330package cf::path; 368package cf::path;
369
370use overload
371 '""' => \&as_string;
372
373# used to convert map paths into valid unix filenames by repalcing / by ∕
374our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
331 375
332sub new { 376sub new {
333 my ($class, $path, $base) = @_; 377 my ($class, $path, $base) = @_;
334 378
335 $path = $path->as_string if ref $path; 379 $path = $path->as_string if ref $path;
341 # ?random/... random maps 385 # ?random/... random maps
342 # /! non-realised random map exit 386 # /! non-realised random map exit
343 # /... normal maps 387 # /... normal maps
344 # ~/... per-player maps without a specific player (DO NOT USE) 388 # ~/... per-player maps without a specific player (DO NOT USE)
345 # ~user/... per-player map of a specific user 389 # ~user/... per-player map of a specific user
390
391 $path =~ s/$PATH_SEP/\//go;
346 392
347 if ($path =~ /^{/) { 393 if ($path =~ /^{/) {
348 # fine as it is 394 # fine as it is
349 } elsif ($path =~ s{^\?random/}{}) { 395 } elsif ($path =~ s{^\?random/}{}) {
350 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 396 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
399# } 445# }
400} 446}
401 447
402# escape the /'s in the path 448# escape the /'s in the path
403sub _escaped_path { 449sub _escaped_path {
404 # ∕ is U+2215
405 (my $path = $_[0]{path}) =~ s/\///g; 450 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
406 $path 451 $path
407} 452}
408 453
409# the original (read-only) location 454# the original (read-only) location
410sub load_path { 455sub load_path {
898=cut 943=cut
899 944
900sub register_extcmd { 945sub register_extcmd {
901 my ($name, $cb) = @_; 946 my ($name, $cb) = @_;
902 947
903 my $caller = caller;
904 #warn "registering extcmd '$name' to '$caller'";
905
906 $EXTCMD{$name} = [$cb, $caller]; 948 $EXTCMD{$name} = $cb;
907} 949}
908 950
909cf::player->attach ( 951cf::player->attach (
910 on_command => sub { 952 on_command => sub {
911 my ($pl, $name, $params) = @_; 953 my ($pl, $name, $params) = @_;
924 966
925 my $msg = eval { from_json $buf }; 967 my $msg = eval { from_json $buf };
926 968
927 if (ref $msg) { 969 if (ref $msg) {
928 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 970 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
929 if (my %reply = $cb->[0]->($pl, $msg)) { 971 if (my %reply = $cb->($pl, $msg)) {
930 $pl->ext_reply ($msg->{msgid}, %reply); 972 $pl->ext_reply ($msg->{msgid}, %reply);
931 } 973 }
932 } 974 }
933 } else { 975 } else {
934 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 976 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
936 978
937 cf::override; 979 cf::override;
938 }, 980 },
939); 981);
940 982
941sub register {
942 my ($base, $pkg) = @_;
943
944 #TODO
945}
946
947sub load_extension { 983sub load_extension {
948 my ($path) = @_; 984 my ($path) = @_;
949 985
950 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 986 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
951 my $base = $1; 987 my $base = $1;
952 my $pkg = $1; 988 my $pkg = $1;
953 $pkg =~ s/[^[:word:]]/_/g; 989 $pkg =~ s/[^[:word:]]/_/g;
954 $pkg = "ext::$pkg"; 990 $pkg = "ext::$pkg";
955 991
956 warn "loading '$path' into '$pkg'\n"; 992 warn "... loading '$path' into '$pkg'\n";
957 993
958 open my $fh, "<:utf8", $path 994 open my $fh, "<:utf8", $path
959 or die "$path: $!"; 995 or die "$path: $!";
960 996
961 my $source = 997 my $source =
966 1002
967 eval $source 1003 eval $source
968 or die $@ ? "$path: $@\n" 1004 or die $@ ? "$path: $@\n"
969 : "extension disabled.\n"; 1005 : "extension disabled.\n";
970 1006
971 push @exts, $pkg; 1007 push @EXTS, $pkg;
972 $ext_pkg{$base} = $pkg;
973
974# no strict 'refs';
975# @{"$pkg\::ISA"} = ext::;
976
977 register $base, $pkg;
978}
979
980sub unload_extension {
981 my ($pkg) = @_;
982
983 warn "removing extension $pkg\n";
984
985 # remove hooks
986 #TODO
987# for my $idx (0 .. $#PLUGIN_EVENT) {
988# delete $hook[$idx]{$pkg};
989# }
990
991 # remove commands
992 for my $name (keys %COMMAND) {
993 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
994
995 if (@cb) {
996 $COMMAND{$name} = \@cb;
997 } else {
998 delete $COMMAND{$name};
999 }
1000 }
1001
1002 # remove extcmds
1003 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1004 delete $EXTCMD{$name};
1005 }
1006
1007 if (my $cb = $pkg->can ("unload")) {
1008 eval {
1009 $cb->($pkg);
1010 1
1011 } or warn "$pkg unloaded, but with errors: $@";
1012 }
1013
1014 Symbol::delete_package $pkg;
1015} 1008}
1016 1009
1017sub load_extensions { 1010sub load_extensions {
1018 for my $ext (<$LIBDIR/*.ext>) { 1011 for my $ext (<$LIBDIR/*.ext>) {
1019 next unless -r $ext; 1012 next unless -r $ext;
1037}; 1030};
1038 1031
1039cf::map->attach (prio => -10000, package => cf::mapsupport::); 1032cf::map->attach (prio => -10000, package => cf::mapsupport::);
1040 1033
1041############################################################################# 1034#############################################################################
1042# load/save perl data associated with player->ob objects
1043
1044sub all_objects(@) {
1045 @_, map all_objects ($_->inv), @_
1046}
1047
1048# TODO: compatibility cruft, remove when no longer needed
1049cf::player->attach (
1050 on_load => sub {
1051 my ($pl, $path) = @_;
1052
1053 for my $o (all_objects $pl->ob) {
1054 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1055 $o->set_ob_key_value ("_perl_data");
1056
1057 %$o = %{ Storable::thaw pack "H*", $value };
1058 }
1059 }
1060 },
1061);
1062
1063#############################################################################
1064 1035
1065=head2 CORE EXTENSIONS 1036=head2 CORE EXTENSIONS
1066 1037
1067Functions and methods that extend core crossfire objects. 1038Functions and methods that extend core crossfire objects.
1068 1039
1040=cut
1041
1042package cf::player;
1043
1044use Coro::AIO;
1045
1069=head3 cf::player 1046=head3 cf::player
1070 1047
1071=over 4 1048=over 4
1072 1049
1073=item cf::player::exists $login 1050=item cf::player::find $login
1074 1051
1075Returns true when the given account exists. 1052Returns the given player object, loading it if necessary (might block).
1076 1053
1077=cut 1054=cut
1078 1055
1079sub cf::player::exists($) { 1056sub playerdir($) {
1080 cf::player::find $_[0] 1057 cf::localdir
1081 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1058 . "/"
1059 . cf::playerdir
1060 . "/"
1061 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1062}
1063
1064sub path($) {
1065 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1066
1067 (playerdir $login) . "/$login.pl"
1068}
1069
1070sub find_active($) {
1071 $cf::PLAYER{$_[0]}
1072 and $cf::PLAYER{$_[0]}->active
1073 and $cf::PLAYER{$_[0]}
1074}
1075
1076sub exists($) {
1077 my ($login) = @_;
1078
1079 $cf::PLAYER{$login}
1080 or cf::sync_job { !aio_stat $login }
1081}
1082
1083sub find($) {
1084 return $cf::PLAYER{$_[0]} || do {
1085 my $login = $_[0];
1086
1087 my $guard = cf::lock_acquire "user_find:$login";
1088
1089 $cf::PLAYER{$_[0]} || do {
1090 my $pl = load_pl path $login
1091 or return;
1092 $cf::PLAYER{$login} = $pl
1093 }
1094 }
1095}
1096
1097sub save($) {
1098 my ($pl) = @_;
1099
1100 return if $pl->{deny_save};
1101
1102 my $path = path $pl;
1103 my $guard = cf::lock_acquire "user_save:$path";
1104
1105 return if $pl->{deny_save};
1106
1107 aio_mkdir playerdir $pl, 0770;
1108 $pl->{last_save} = $cf::RUNTIME;
1109
1110 $pl->save_pl ($path);
1111 Coro::cede;
1112}
1113
1114sub new($) {
1115 my ($login) = @_;
1116
1117 my $self = create;
1118
1119 $self->ob->name ($login);
1120 $self->{deny_save} = 1;
1121
1122 $cf::PLAYER{$login} = $self;
1123
1124 $self
1125}
1126
1127=item $pl->quit_character
1128
1129Nukes the player without looking back. If logged in, the connection will
1130be destroyed. May block for a long time.
1131
1132=cut
1133
1134sub quit_character {
1135 my ($pl) = @_;
1136
1137 $pl->{deny_save} = 1;
1138 $pl->password ("*"); # this should lock out the player until we nuked the dir
1139
1140 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1141 $pl->deactivate;
1142 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1143 $pl->ns->destroy if $pl->ns;
1144
1145 my $path = playerdir $pl;
1146 my $temp = "$path~$cf::RUNTIME~deleting~";
1147 aio_rename $path, $temp;
1148 delete $cf::PLAYER{$pl->ob->name};
1149 $pl->destroy;
1150 IO::AIO::aio_rmtree $temp;
1151}
1152
1153=item cf::player::list_logins
1154
1155Returns am arrayref of all valid playernames in the system, can take a
1156while and may block, so not sync_job-capable, ever.
1157
1158=cut
1159
1160sub list_logins {
1161 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1162 or return [];
1163
1164 my @logins;
1165
1166 for my $login (@$dirs) {
1167 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1168 aio_read $fh, 0, 512, my $buf, 0 or next;
1169 $buf !~ /^password -------------$/m or next; # official not-valid tag
1170
1171 utf8::decode $login;
1172 push @logins, $login;
1173 }
1174
1175 \@logins
1176}
1177
1178=item $player->maps
1179
1180Returns an arrayref of cf::path's of all maps that are private for this
1181player. May block.
1182
1183=cut
1184
1185sub maps($) {
1186 my ($pl) = @_;
1187
1188 my $files = aio_readdir playerdir $pl
1189 or return;
1190
1191 my @paths;
1192
1193 for (@$files) {
1194 utf8::decode $_;
1195 next if /\.(?:pl|pst)$/;
1196 next unless /^$PATH_SEP/o;
1197
1198 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1199 }
1200
1201 \@paths
1082} 1202}
1083 1203
1084=item $player->ext_reply ($msgid, $msgtype, %msg) 1204=item $player->ext_reply ($msgid, $msgtype, %msg)
1085 1205
1086Sends an ext reply to the player. 1206Sends an ext reply to the player.
1087 1207
1088=cut 1208=cut
1089 1209
1090sub cf::player::ext_reply($$$%) { 1210sub ext_reply($$$%) {
1091 my ($self, $id, %msg) = @_; 1211 my ($self, $id, %msg) = @_;
1092 1212
1093 $msg{msgid} = $id; 1213 $msg{msgid} = $id;
1094 1214
1095 $self->send ("ext " . to_json \%msg); 1215 $self->send ("ext " . cf::to_json \%msg);
1096} 1216}
1217
1218package cf;
1097 1219
1098=back 1220=back
1099 1221
1100 1222
1101=head3 cf::map 1223=head3 cf::map
1267 Coro::cede; 1389 Coro::cede;
1268 1390
1269 $self->in_memory (cf::MAP_IN_MEMORY); 1391 $self->in_memory (cf::MAP_IN_MEMORY);
1270} 1392}
1271 1393
1394# find and load all maps in the 3x3 area around a map
1395sub load_diag {
1396 my ($map) = @_;
1397
1398 my @diag; # diagonal neighbours
1399
1400 for (0 .. 3) {
1401 my $neigh = $map->tile_path ($_)
1402 or next;
1403 $neigh = find $neigh, $map
1404 or next;
1405 $neigh->load;
1406
1407 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1408 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1409 }
1410
1411 for (@diag) {
1412 my $neigh = find @$_
1413 or next;
1414 $neigh->load;
1415 }
1416}
1417
1272sub find_sync { 1418sub find_sync {
1273 my ($path, $origin) = @_; 1419 my ($path, $origin) = @_;
1274 1420
1275 cf::sync_job { 1421 cf::sync_job { find $path, $origin }
1276 my $map = cf::map::find $path, $origin;
1277 $map
1278 }
1279} 1422}
1280 1423
1281sub do_load_sync { 1424sub do_load_sync {
1282 my ($map) = @_; 1425 my ($map) = @_;
1283 1426
1284 cf::sync_job { $map->load }; 1427 cf::sync_job { $map->load };
1285} 1428}
1286 1429
1430our %MAP_PREFETCH;
1431our $MAP_PREFETCHER = Coro::async {
1432 while () {
1433 while (%MAP_PREFETCH) {
1434 my $key = each %MAP_PREFETCH
1435 or next;
1436 my $path = delete $MAP_PREFETCH{$key};
1437
1438 my $map = find $path
1439 or next;
1440 $map->load;
1441 }
1442 Coro::schedule;
1443 }
1444};
1445
1446sub find_async {
1447 my ($path, $origin) = @_;
1448
1449 $path = new cf::path $path, $origin && $origin->path;
1450 my $key = $path->as_string;
1451
1452 if (my $map = $cf::MAP{$key}) {
1453 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1454 }
1455
1456 $MAP_PREFETCH{$key} = $path;
1457 $MAP_PREFETCHER->ready;
1458
1459 ()
1460}
1461
1287sub save { 1462sub save {
1288 my ($self) = @_; 1463 my ($self) = @_;
1289 1464
1290 my $lock = cf::lock_acquire "map_data:" . $self->path; 1465 my $lock = cf::lock_acquire "map_data:" . $self->path;
1291 1466
1299 $self->{load_path} = $save; 1474 $self->{load_path} = $save;
1300 1475
1301 return if $self->{deny_save}; 1476 return if $self->{deny_save};
1302 1477
1303 local $self->{last_access} = $self->last_access;#d# 1478 local $self->{last_access} = $self->last_access;#d#
1479
1480 cf::async {
1481 $_->contr->save for $self->players;
1482 };
1304 1483
1305 if ($uniq) { 1484 if ($uniq) {
1306 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1307 $self->save_objects ($uniq, cf::IO_UNIQUES); 1486 $self->save_objects ($uniq, cf::IO_UNIQUES);
1308 } else { 1487 } else {
1403 } 1582 }
1404 1583
1405 $map 1584 $map
1406} 1585}
1407 1586
1408sub emergency_save { 1587=item cf::map::unique_maps
1409 my $freeze_guard = cf::freeze_mainloop;
1410 1588
1411 warn "enter emergency map save\n"; 1589Returns an arrayref of cf::path's of all shared maps that have
1590instantiated unique items. May block.
1412 1591
1413 cf::sync_job { 1592=cut
1414 warn "begin emergency map save\n"; 1593
1415 $_->save for values %cf::MAP; 1594sub unique_maps() {
1595 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1596 or return;
1597
1598 my @paths;
1599
1600 for (@$files) {
1601 utf8::decode $_;
1602 next if /\.pst$/;
1603 next unless /^$PATH_SEP/o;
1604
1605 push @paths, new cf::path $_;
1416 }; 1606 }
1417 1607
1418 warn "end emergency map save\n"; 1608 \@paths
1419} 1609}
1420 1610
1421package cf; 1611package cf;
1422 1612
1423=back 1613=back
1424 1614
1615=head3 cf::object
1616
1617=cut
1618
1619package cf::object;
1620
1621=over 4
1622
1623=item $ob->inv_recursive
1624
1625Returns the inventory of the object _and_ their inventories, recursively.
1626
1627=cut
1628
1629sub inv_recursive_;
1630sub inv_recursive_ {
1631 map { $_, inv_recursive_ $_->inv } @_
1632}
1633
1634sub inv_recursive {
1635 inv_recursive_ inv $_[0]
1636}
1637
1638package cf;
1639
1640=back
1425 1641
1426=head3 cf::object::player 1642=head3 cf::object::player
1427 1643
1428=over 4 1644=over 4
1429 1645
1521 # use -1 or undef as default coordinates, not 0, 0 1737 # use -1 or undef as default coordinates, not 0, 0
1522 ($x, $y) = ($map->enter_x, $map->enter_y) 1738 ($x, $y) = ($map->enter_x, $map->enter_y)
1523 if $x <=0 && $y <= 0; 1739 if $x <=0 && $y <= 0;
1524 1740
1525 $map->load; 1741 $map->load;
1742 $map->load_diag;
1526 1743
1744 return unless $self->contr->active;
1527 $self->activate_recursive; 1745 $self->activate_recursive;
1528 $self->enter_map ($map, $x, $y); 1746 $self->enter_map ($map, $x, $y);
1529} 1747}
1530 1748
1531cf::player->attach ( 1749cf::player->attach (
1543 my ($pl) = @_; 1761 my ($pl) = @_;
1544 1762
1545 # try to abort aborted map switching on player login :) 1763 # try to abort aborted map switching on player login :)
1546 # should happen only on crashes 1764 # should happen only on crashes
1547 if ($pl->ob->{_link_pos}) { 1765 if ($pl->ob->{_link_pos}) {
1548
1549 $pl->ob->enter_link; 1766 $pl->ob->enter_link;
1550 (Coro::async_pool { 1767 (async {
1551 # we need this sleep as the login has a concurrent enter_exit running 1768 # we need this sleep as the login has a concurrent enter_exit running
1552 # and this sleep increases chances of the player not ending up in scorn 1769 # and this sleep increases chances of the player not ending up in scorn
1770 $pl->ob->reply (undef,
1771 "There was an internal problem at your last logout, "
1772 . "the server will try to bring you to your intended destination in a second.",
1773 cf::NDI_RED);
1553 Coro::Timer::sleep 1; 1774 Coro::Timer::sleep 1;
1554 $pl->ob->leave_link; 1775 $pl->ob->leave_link;
1555 })->prio (2); 1776 })->prio (2);
1556 } 1777 }
1557 }, 1778 },
1562=cut 1783=cut
1563 1784
1564sub cf::object::player::goto { 1785sub cf::object::player::goto {
1565 my ($self, $path, $x, $y) = @_; 1786 my ($self, $path, $x, $y) = @_;
1566 1787
1788 $path = new cf::path $path;
1789
1567 $self->enter_link; 1790 $self->enter_link;
1568 1791
1569 (Coro::async_pool { 1792 (async {
1570 $path = new cf::path $path;
1571
1572 my $map = cf::map::find $path->as_string; 1793 my $map = cf::map::find $path->as_string;
1573 $map = $map->customise_for ($self) if $map; 1794 $map = $map->customise_for ($self) if $map;
1574 1795
1575# warn "entering ", $map->path, " at ($x, $y)\n" 1796# warn "entering ", $map->path, " at ($x, $y)\n"
1576# if $map; 1797# if $map;
1577 1798
1578 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1799 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1579 1800
1580 $self->leave_link ($map, $x, $y); 1801 $self->leave_link ($map, $x, $y);
1581 })->prio (1); 1802 })->prio (1);
1582} 1803}
1583 1804
1636 1857
1637 return unless $self->type == cf::PLAYER; 1858 return unless $self->type == cf::PLAYER;
1638 1859
1639 $self->enter_link; 1860 $self->enter_link;
1640 1861
1641 (Coro::async_pool { 1862 (async {
1642 $self->deactivate_recursive; # just to be sure 1863 $self->deactivate_recursive; # just to be sure
1643 unless (eval { 1864 unless (eval {
1644 prepare_random_map $exit 1865 prepare_random_map $exit
1645 if $exit->slaying eq "/!"; 1866 if $exit->slaying eq "/!";
1646 1867
1649 1870
1650 1; 1871 1;
1651 }) { 1872 }) {
1652 $self->message ("Something went wrong deep within the crossfire server. " 1873 $self->message ("Something went wrong deep within the crossfire server. "
1653 . "I'll try to bring you back to the map you were before. " 1874 . "I'll try to bring you back to the map you were before. "
1654 . "Please report this to the dungeon master", 1875 . "Please report this to the dungeon master!",
1655 cf::NDI_UNIQUE | cf::NDI_RED); 1876 cf::NDI_UNIQUE | cf::NDI_RED);
1656 1877
1657 warn "ERROR in enter_exit: $@"; 1878 warn "ERROR in enter_exit: $@";
1658 $self->leave_link; 1879 $self->leave_link;
1659 } 1880 }
1727 } 1948 }
1728 } 1949 }
1729 }, 1950 },
1730); 1951);
1731 1952
1732=item $client->coro (\&cb) 1953=item $client->async (\&cb)
1733 1954
1734Create a new coroutine, running the specified callback. The coroutine will 1955Create a new coroutine, running the specified callback. The coroutine will
1735be automatically cancelled when the client gets destroyed (e.g. on logout, 1956be automatically cancelled when the client gets destroyed (e.g. on logout,
1736or loss of connection). 1957or loss of connection).
1737 1958
1738=cut 1959=cut
1739 1960
1740sub cf::client::coro { 1961sub cf::client::async {
1741 my ($self, $cb) = @_; 1962 my ($self, $cb) = @_;
1742 1963
1743 my $coro = &Coro::async_pool ($cb); 1964 my $coro = &Coro::async ($cb);
1744 1965
1745 $coro->on_destroy (sub { 1966 $coro->on_destroy (sub {
1746 delete $self->{_coro}{$coro+0}; 1967 delete $self->{_coro}{$coro+0};
1747 }); 1968 });
1748 1969
1991 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 2212 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
1992 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 2213 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
1993 2214
1994 if (exists $CFG{mlockall}) { 2215 if (exists $CFG{mlockall}) {
1995 eval { 2216 eval {
1996 $CFG{mlockall} ? &mlockall : &munlockall 2217 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1997 and die "WARNING: m(un)lockall failed: $!\n"; 2218 and die "WARNING: m(un)lockall failed: $!\n";
1998 }; 2219 };
1999 warn $@ if $@; 2220 warn $@ if $@;
2000 } 2221 }
2001} 2222}
2002 2223
2003sub main { 2224sub main {
2004 # we must not ever block the main coroutine 2225 # we must not ever block the main coroutine
2005 local $Coro::idle = sub { 2226 local $Coro::idle = sub {
2006 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2227 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2007 Coro::async_pool { Event::one_event }; 2228 async { Event::one_event };
2008 }; 2229 };
2009 2230
2010 cfg_load; 2231 cfg_load;
2011 db_load; 2232 db_load;
2012 load_extensions; 2233 load_extensions;
2013 Event::loop; 2234 Event::loop;
2014} 2235}
2015 2236
2016############################################################################# 2237#############################################################################
2017# initialisation 2238# initialisation and cleanup
2239
2240# install some emergency cleanup handlers
2241BEGIN {
2242 for my $signal (qw(INT HUP TERM)) {
2243 Event->signal (
2244 data => WF_AUTOCANCEL,
2245 signal => $signal,
2246 cb => sub {
2247 cf::cleanup "SIG$signal";
2248 },
2249 );
2250 }
2251}
2252
2253sub emergency_save() {
2254 my $freeze_guard = cf::freeze_mainloop;
2255
2256 warn "enter emergency perl save\n";
2257
2258 cf::sync_job {
2259 # use a peculiar iteration method to avoid tripping on perl
2260 # refcount bugs in for. also avoids problems with players
2261 # and maps saved/Destroyed asynchronously.
2262 warn "begin emergency player save\n";
2263 for my $login (keys %cf::PLAYER) {
2264 my $pl = $cf::PLAYER{$login} or next;
2265 $pl->valid or next;
2266 $pl->save;
2267 }
2268 warn "end emergency player save\n";
2269
2270 warn "begin emergency map save\n";
2271 for my $path (keys %cf::MAP) {
2272 my $map = $cf::MAP{$path} or next;
2273 $map->valid or next;
2274 $map->save;
2275 }
2276 warn "end emergency map save\n";
2277 };
2278
2279 warn "leave emergency perl save\n";
2280}
2018 2281
2019sub reload() { 2282sub reload() {
2020 # can/must only be called in main 2283 # can/must only be called in main
2021 if ($Coro::current != $Coro::main) { 2284 if ($Coro::current != $Coro::main) {
2022 warn "can only reload from main coroutine\n"; 2285 warn "can only reload from main coroutine\n";
2023 return; 2286 return;
2024 } 2287 }
2025 2288
2026 warn "reloading..."; 2289 warn "reloading...";
2027 2290
2291 warn "freezing server";
2028 my $guard = freeze_mainloop; 2292 my $guard = freeze_mainloop;
2029 cf::emergency_save; 2293 cf::emergency_save;
2030 2294
2295 warn "sync database to disk";
2296 cf::db_sync;
2297 IO::AIO::flush;
2298
2031 eval { 2299 eval {
2032 # if anything goes wrong in here, we should simply crash as we already saved 2300 # if anything goes wrong in here, we should simply crash as we already saved
2033 2301
2034 # cancel all watchers 2302 warn "cancel all watchers";
2035 for (Event::all_watchers) { 2303 for (Event::all_watchers) {
2036 $_->cancel if $_->data & WF_AUTOCANCEL; 2304 $_->cancel if $_->data & WF_AUTOCANCEL;
2037 } 2305 }
2038 2306
2039 # cancel all extension coros 2307 warn "cancel all extension coros";
2040 $_->cancel for values %EXT_CORO; 2308 $_->cancel for values %EXT_CORO;
2041 %EXT_CORO = (); 2309 %EXT_CORO = ();
2042 2310
2311 warn "remove commands";
2312 %COMMAND = ();
2313
2314 warn "remove ext commands";
2315 %EXTCMD = ();
2316
2043 # unload all extensions 2317 warn "unload/nuke all extensions";
2044 for (@exts) { 2318 for my $pkg (@EXTS) {
2045 warn "unloading <$_>"; 2319 warn "... unloading $pkg";
2046 unload_extension $_; 2320
2321 if (my $cb = $pkg->can ("unload")) {
2322 eval {
2323 $cb->($pkg);
2324 1
2325 } or warn "$pkg unloaded, but with errors: $@";
2047 } 2326 }
2048 2327
2328 warn "... nuking $pkg";
2329 Symbol::delete_package $pkg;
2330 }
2331
2049 # unload all modules loaded from $LIBDIR 2332 warn "unload all perl modules loaded from $LIBDIR";
2050 while (my ($k, $v) = each %INC) { 2333 while (my ($k, $v) = each %INC) {
2051 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2334 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2052 2335
2053 warn "removing <$k>"; 2336 warn "removing <$k>";
2054 delete $INC{$k}; 2337 delete $INC{$k};
2061 } 2344 }
2062 2345
2063 Symbol::delete_package $k; 2346 Symbol::delete_package $k;
2064 } 2347 }
2065 2348
2066 # sync database to disk
2067 cf::db_sync;
2068 IO::AIO::flush;
2069
2070 # get rid of safe::, as good as possible 2349 warn "get rid of safe::, as good as possible";
2071 Symbol::delete_package "safe::$_" 2350 Symbol::delete_package "safe::$_"
2072 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2351 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2073 2352
2074 # remove register_script_function callbacks
2075 # TODO
2076
2077 # unload cf.pm "a bit" 2353 warn "unload cf.pm \"a bit\"";
2078 delete $INC{"cf.pm"}; 2354 delete $INC{"cf.pm"};
2079 2355
2080 # don't, removes xs symbols, too, 2356 # don't, removes xs symbols, too,
2081 # and global variables created in xs 2357 # and global variables created in xs
2082 #Symbol::delete_package __PACKAGE__; 2358 #Symbol::delete_package __PACKAGE__;
2083 2359
2084 # reload cf.pm
2085 warn "reloading cf.pm"; 2360 warn "reloading cf.pm";
2086 require cf; 2361 require cf;
2087 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2362 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2088 2363
2089 # load config and database again 2364 warn "load config and database again";
2090 cf::cfg_load; 2365 cf::cfg_load;
2091 cf::db_load; 2366 cf::db_load;
2092 2367
2093 # load extensions
2094 warn "load extensions"; 2368 warn "load extensions";
2095 cf::load_extensions; 2369 cf::load_extensions;
2096 2370
2097 # reattach attachments to objects 2371 warn "reattach attachments to objects/players";
2098 warn "reattach";
2099 _global_reattach; 2372 _global_reattach;
2373 warn "reattach attachments to maps";
2374 reattach $_ for values %MAP;
2100 }; 2375 };
2101 2376
2102 if ($@) { 2377 if ($@) {
2103 warn $@; 2378 warn $@;
2104 warn "error while reloading, exiting."; 2379 warn "error while reloading, exiting.";
2105 exit 1; 2380 exit 1;
2106 } 2381 }
2107 2382
2108 warn "reloaded successfully"; 2383 warn "reloaded";
2109}; 2384};
2110 2385
2111############################################################################# 2386#############################################################################
2112 2387
2113unless ($LINK_MAP) { 2388unless ($LINK_MAP) {
2120 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2395 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2121 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2396 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2122 2397
2123 # dirty hack because... archetypes are not yet loaded 2398 # dirty hack because... archetypes are not yet loaded
2124 Event->timer ( 2399 Event->timer (
2125 after => 2, 2400 after => 10,
2126 cb => sub { 2401 cb => sub {
2127 $_[0]->w->cancel; 2402 $_[0]->w->cancel;
2128 2403
2129 # provide some exits "home" 2404 # provide some exits "home"
2130 my $exit = cf::object::new "exit"; 2405 my $exit = cf::object::new "exit";
2148 $LINK_MAP->{deny_save} = 1; 2423 $LINK_MAP->{deny_save} = 1;
2149 $LINK_MAP->{deny_reset} = 1; 2424 $LINK_MAP->{deny_reset} = 1;
2150 2425
2151 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2426 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2152} 2427}
2153
2154register "<global>", __PACKAGE__;
2155 2428
2156register_command "reload" => sub { 2429register_command "reload" => sub {
2157 my ($who, $arg) = @_; 2430 my ($who, $arg) = @_;
2158 2431
2159 if ($who->flag (FLAG_WIZ)) { 2432 if ($who->flag (FLAG_WIZ)) {
2172 data => WF_AUTOCANCEL, 2445 data => WF_AUTOCANCEL,
2173 cb => sub { 2446 cb => sub {
2174 cf::server_tick; # one server iteration 2447 cf::server_tick; # one server iteration
2175 $RUNTIME += $TICK; 2448 $RUNTIME += $TICK;
2176 $NEXT_TICK += $TICK; 2449 $NEXT_TICK += $TICK;
2450
2451 $WAIT_FOR_TICK->broadcast;
2452 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2177 2453
2178 # if we are delayed by four ticks or more, skip them all 2454 # if we are delayed by four ticks or more, skip them all
2179 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2455 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2180 2456
2181 $TICK_WATCHER->at ($NEXT_TICK); 2457 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines