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.115 by root, Mon Jan 1 16:50:10 2007 UTC vs.
Revision 1.149 by root, Mon Jan 8 14:11:05 2007 UTC

8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
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 Digest::MD5; 20use Digest::MD5;
21use Fcntl; 21use Fcntl;
22use IO::AIO 2.31 (); 22use IO::AIO 2.32 ();
23use YAML::Syck (); 23use YAML::Syck ();
24use Time::HiRes; 24use Time::HiRes;
25 25
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
47our %CFG; 47our %CFG;
48 48
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %PLAYER; # all users
52our %MAP; # all maps 53our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 54our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 55our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 56our %EXT_CORO; # coroutines bound to extensions
57 57
58binmode STDOUT; 58binmode STDOUT;
59binmode STDERR; 59binmode STDERR;
60 60
61# read virtual server time, if available 61# read virtual server time, if available
71mkdir cf::localdir . "/" . cf::uniquedir; 71mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 72mkdir $RANDOM_MAPS;
73 73
74# a special map that is always available 74# a special map that is always available
75our $LINK_MAP; 75our $LINK_MAP;
76 76our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 77
79############################################################################# 78#############################################################################
80 79
81=head2 GLOBAL VARIABLES 80=head2 GLOBAL VARIABLES
82 81
119 utf8::encode $msg; 118 utf8::encode $msg;
120 119
121 $msg .= "\n" 120 $msg .= "\n"
122 unless $msg =~ /\n$/; 121 unless $msg =~ /\n$/;
123 122
124 LOG llevError, "cfperl: $msg"; 123 LOG llevError, $msg;
125 }; 124 };
126} 125}
127 126
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
181sub to_json($) { 180sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 182 JSON::Syck::Dump $_[0]
184} 183}
185 184
185=item cf::lock_wait $string
186
187Wait until the given lock is available. See cf::lock_acquire.
188
189=item my $lock = cf::lock_acquire $string
190
191Wait until the given lock is available and then acquires it and returns
192a Coro::guard object. If the guard object gets destroyed (goes out of scope,
193for example when the coroutine gets canceled), the lock is automatically
194returned.
195
196Lock names should begin with a unique identifier (for example, cf::map::find
197uses map_find and cf::map::load uses map_load).
198
199=cut
200
201our %LOCK;
202
203sub lock_wait($) {
204 my ($key) = @_;
205
206 # wait for lock, if any
207 while ($LOCK{$key}) {
208 push @{ $LOCK{$key} }, $Coro::current;
209 Coro::schedule;
210 }
211}
212
213sub lock_acquire($) {
214 my ($key) = @_;
215
216 # wait, to be sure we are not locked
217 lock_wait $key;
218
219 $LOCK{$key} = [];
220
221 Coro::guard {
222 # wake up all waiters, to be on the safe side
223 $_->ready for @{ delete $LOCK{$key} };
224 }
225}
226
227sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active;
229
230 my $guard = Coro::guard { $TICK_WATCHER->start };
231 $TICK_WATCHER->stop;
232 $guard
233}
234
235=item cf::async { BLOCK }
236
237Currently the same as Coro::async_pool, meaning you cannot use
238C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
239thing you are allowed to do is call C<prio> on it.
240
241=cut
242
243BEGIN { *async = \&Coro::async_pool }
244
186=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
187 246
188The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 249reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
203 # this is the main coro, too bad, we have to block 262 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 263 # till the operation succeeds, freezing the server :/
205 264
206 # TODO: use suspend/resume instead 265 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 266 # (but this is cancel-safe)
208 local $FREEZE = 1; 267 my $freeze_guard = freeze_mainloop;
209 268
210 my $busy = 1; 269 my $busy = 1;
211 my @res; 270 my @res;
212 271
213 (Coro::async { 272 (async {
214 @res = eval { $job->() }; 273 @res = eval { $job->() };
215 warn $@ if $@; 274 warn $@ if $@;
216 undef $busy; 275 undef $busy;
217 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
218 277
219 while ($busy) { 278 while ($busy) {
220 Coro::cede_notself; 279 Coro::cede or Event::one_event;
221 Event::one_event unless Coro::nready;
222 } 280 }
223 281
224 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
225 } else { 283 } else {
226 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
227 285
228 $job->() 286 $job->()
229 } 287 }
230} 288}
231 289
232=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
233 291
234Creates and returns a new coro. This coro is automcatially being canceled 292Like async, but this coro is automcatially being canceled when the
235when the extension calling this is being unloaded. 293extension calling this is being unloaded.
236 294
237=cut 295=cut
238 296
239sub coro(&) { 297sub async_ext(&) {
240 my $cb = shift; 298 my $cb = shift;
241 299
242 my $coro; $coro = async { 300 my $coro = &Coro::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 301
249 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
251 }); 304 });
252 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
817 (aio_load "$filename.pst", $av) >= 0 870 (aio_load "$filename.pst", $av) >= 0
818 or return; 871 or return;
819 $av = eval { (Storable::thaw $av)->{objs} }; 872 $av = eval { (Storable::thaw $av)->{objs} };
820 } 873 }
821 874
875 warn sprintf "loading %s (%d)\n",
876 $filename, length $data, scalar @{$av || []};#d#
822 return ($data, $av); 877 return ($data, $av);
823} 878}
824 879
825############################################################################# 880#############################################################################
826# command handling &c 881# command handling &c
1017 1072
1018=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1019 1074
1020Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1021 1076
1077=cut
1078
1079package cf::player;
1080
1022=head3 cf::player 1081=head3 cf::player
1023 1082
1024=over 4 1083=over 4
1025 1084
1026=item cf::player::exists $login 1085=item cf::player::find $login
1027 1086
1028Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1029 1088
1030=cut 1089=cut
1031 1090
1032sub cf::player::exists($) { 1091sub playerdir($) {
1033 cf::player::find $_[0] 1092 cf::localdir
1034 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 . "/"
1094 . cf::playerdir
1095 . "/"
1096 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1097}
1098
1099sub path($) {
1100 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1101
1102 (playerdir $login) . "/$login.pl"
1103}
1104
1105sub find_active($) {
1106 $cf::PLAYER{$_[0]}
1107 and $cf::PLAYER{$_[0]}->active
1108 and $cf::PLAYER{$_[0]}
1109}
1110
1111sub exists($) {
1112 my ($login) = @_;
1113
1114 $cf::PLAYER{$login}
1115 or cf::sync_job { !aio_stat $login }
1116}
1117
1118sub find($) {
1119 return $cf::PLAYER{$_[0]} || do {
1120 my $login = $_[0];
1121
1122 my $guard = cf::lock_acquire "user_find:$login";
1123
1124 $cf::PLAYER{$login} ||= (load_pl path $login or return);
1125 };
1126}
1127
1128sub save($) {
1129 my ($pl) = @_;
1130
1131 return if $pl->{deny_save};
1132
1133 my $path = path $pl;
1134 my $guard = cf::lock_acquire "user_save:$path";
1135
1136 return if $pl->{deny_save};
1137
1138 Coro::AIO::aio_mkdir playerdir $pl, 0770;
1139 $pl->{last_save} = $cf::RUNTIME;
1140
1141 $pl->save_pl ($path);
1142 Coro::cede;
1143}
1144
1145sub new($) {
1146 my ($login) = @_;
1147
1148 my $self = create;
1149
1150 $self->ob->name ($login);
1151 $self->{deny_save} = 1;
1152
1153 $cf::PLAYER{$login} = $self;
1154
1155 $self
1156}
1157
1158sub quit_character {
1159 my ($pl) = @_;
1160
1161 $pl->{deny_save} = 1;
1162 $pl->password ("*"); # this should lock out the player until we nuked the dir
1163
1164 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1165 $pl->deactivate;
1166 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1167 $pl->ns->destroy if $pl->ns;
1168
1169 my $path = playerdir $pl;
1170 my $temp = "$path~$cf::RUNTIME~deleting~";
1171 IO::AIO::aio_rename $path, $temp, sub {
1172 delete $cf::PLAYER{$pl->ob->name};
1173 $pl->destroy;
1174
1175 IO::AIO::aio_rmtree $temp;
1176 };
1035} 1177}
1036 1178
1037=item $player->ext_reply ($msgid, $msgtype, %msg) 1179=item $player->ext_reply ($msgid, $msgtype, %msg)
1038 1180
1039Sends an ext reply to the player. 1181Sends an ext reply to the player.
1040 1182
1041=cut 1183=cut
1042 1184
1043sub cf::player::ext_reply($$$%) { 1185sub ext_reply($$$%) {
1044 my ($self, $id, %msg) = @_; 1186 my ($self, $id, %msg) = @_;
1045 1187
1046 $msg{msgid} = $id; 1188 $msg{msgid} = $id;
1047 1189
1048 $self->send ("ext " . to_json \%msg); 1190 $self->send ("ext " . cf::to_json \%msg);
1049} 1191}
1192
1193package cf;
1050 1194
1051=back 1195=back
1052 1196
1053 1197
1054=head3 cf::map 1198=head3 cf::map
1060package cf::map; 1204package cf::map;
1061 1205
1062use Fcntl; 1206use Fcntl;
1063use Coro::AIO; 1207use Coro::AIO;
1064 1208
1065our $MAX_RESET = 7200; 1209our $MAX_RESET = 3600;
1066our $DEFAULT_RESET = 3600; 1210our $DEFAULT_RESET = 3000;
1067 1211
1068sub generate_random_map { 1212sub generate_random_map {
1069 my ($path, $rmp) = @_; 1213 my ($path, $rmp) = @_;
1070 1214
1071 # mit "rum" bekleckern, nicht 1215 # mit "rum" bekleckern, nicht
1087# and all this just because we cannot iterate over 1231# and all this just because we cannot iterate over
1088# all maps in C++... 1232# all maps in C++...
1089sub change_all_map_light { 1233sub change_all_map_light {
1090 my ($change) = @_; 1234 my ($change) = @_;
1091 1235
1092 $_->change_map_light ($change) for values %cf::MAP; 1236 $_->change_map_light ($change)
1237 for grep $_->outdoor, values %cf::MAP;
1093} 1238}
1094 1239
1095sub try_load_header($) { 1240sub try_load_header($) {
1096 my ($path) = @_; 1241 my ($path) = @_;
1097 1242
1100 or return; 1245 or return;
1101 1246
1102 my $map = cf::map::new 1247 my $map = cf::map::new
1103 or return; 1248 or return;
1104 1249
1250 # for better error messages only, will be overwritten
1251 $map->path ($path);
1252
1105 $map->load_header ($path) 1253 $map->load_header ($path)
1106 or return; 1254 or return;
1107 1255
1108 $map->{load_path} = $path; 1256 $map->{load_path} = $path;
1109 1257
1110 $map 1258 $map
1111} 1259}
1112 1260
1261sub find;
1113sub find_map { 1262sub find {
1114 my ($path, $origin) = @_; 1263 my ($path, $origin) = @_;
1115 1264
1116 #warn "find_map<$path,$origin>\n";#d# 1265 #warn "find<$path,$origin>\n";#d#
1117 1266
1118 $path = new cf::path $path, $origin && $origin->path; 1267 $path = new cf::path $path, $origin && $origin->path;
1119 my $key = $path->as_string; 1268 my $key = $path->as_string;
1120 1269
1270 cf::lock_wait "map_find:$key";
1271
1121 $cf::MAP{$key} || do { 1272 $cf::MAP{$key} || do {
1273 my $guard = cf::lock_acquire "map_find:$key";
1274
1122 # do it the slow way 1275 # do it the slow way
1123 my $map = try_load_header $path->save_path; 1276 my $map = try_load_header $path->save_path;
1124 1277
1278 Coro::cede;
1279
1125 if ($map) { 1280 if ($map) {
1281 $map->last_access ((delete $map->{last_access})
1282 || $cf::RUNTIME); #d#
1126 # safety 1283 # safety
1127 $map->{instantiate_time} = $cf::RUNTIME 1284 $map->{instantiate_time} = $cf::RUNTIME
1128 if $map->{instantiate_time} > $cf::RUNTIME; 1285 if $map->{instantiate_time} > $cf::RUNTIME;
1129 } else { 1286 } else {
1130 if (my $rmp = $path->random_map_params) { 1287 if (my $rmp = $path->random_map_params) {
1135 1292
1136 $map or return; 1293 $map or return;
1137 1294
1138 $map->{load_original} = 1; 1295 $map->{load_original} = 1;
1139 $map->{instantiate_time} = $cf::RUNTIME; 1296 $map->{instantiate_time} = $cf::RUNTIME;
1297 $map->last_access ($cf::RUNTIME);
1140 $map->instantiate; 1298 $map->instantiate;
1141 1299
1142 # per-player maps become, after loading, normal maps 1300 # per-player maps become, after loading, normal maps
1143 $map->per_player (0) if $path->{user_rel}; 1301 $map->per_player (0) if $path->{user_rel};
1144 } 1302 }
1145 1303
1146 $map->path ($key); 1304 $map->path ($key);
1147 $map->{path} = $path; 1305 $map->{path} = $path;
1148 $map->last_access ($cf::RUNTIME); 1306 $map->{last_save} = $cf::RUNTIME;
1307
1308 Coro::cede;
1149 1309
1150 if ($map->should_reset) { 1310 if ($map->should_reset) {
1151 $map->reset; 1311 $map->reset;
1312 undef $guard;
1152 $map = find_map $path; 1313 $map = find $path
1314 or return;
1153 } 1315 }
1154 1316
1155 $cf::MAP{$key} = $map 1317 $cf::MAP{$key} = $map
1156 } 1318 }
1157} 1319}
1158 1320
1159sub load { 1321sub load {
1160 my ($self) = @_; 1322 my ($self) = @_;
1161 1323
1324 my $path = $self->{path};
1325 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1326
1162 return if $self->in_memory != cf::MAP_SWAPPED; 1327 return if $self->in_memory != cf::MAP_SWAPPED;
1163 1328
1164 $self->in_memory (cf::MAP_LOADING); 1329 $self->in_memory (cf::MAP_LOADING);
1165
1166 my $path = $self->{path};
1167 1330
1168 $self->alloc; 1331 $self->alloc;
1169 $self->load_objects ($self->{load_path}, 1) 1332 $self->load_objects ($self->{load_path}, 1)
1170 or return; 1333 or return;
1171 1334
1177 if (aio_open $uniq, O_RDONLY, 0) { 1340 if (aio_open $uniq, O_RDONLY, 0) {
1178 $self->clear_unique_items; 1341 $self->clear_unique_items;
1179 $self->load_objects ($uniq, 0); 1342 $self->load_objects ($uniq, 0);
1180 } 1343 }
1181 } 1344 }
1345
1346 Coro::cede;
1182 1347
1183 # now do the right thing for maps 1348 # now do the right thing for maps
1184 $self->link_multipart_objects; 1349 $self->link_multipart_objects;
1185 1350
1186 if ($self->{path}->is_style_map) { 1351 if ($self->{path}->is_style_map) {
1194 $self->difficulty ($self->estimate_difficulty) 1359 $self->difficulty ($self->estimate_difficulty)
1195 unless $self->difficulty; 1360 unless $self->difficulty;
1196 $self->activate; 1361 $self->activate;
1197 } 1362 }
1198 1363
1364 Coro::cede;
1365
1199 $self->in_memory (cf::MAP_IN_MEMORY); 1366 $self->in_memory (cf::MAP_IN_MEMORY);
1200} 1367}
1201 1368
1202sub load_map_sync { 1369sub find_sync {
1203 my ($path, $origin) = @_; 1370 my ($path, $origin) = @_;
1204 1371
1205 #warn "load_map_sync<$path, $origin>\n";#d# 1372 cf::sync_job { cf::map::find $path, $origin }
1373}
1206 1374
1207 cf::sync_job { 1375sub do_load_sync {
1208 my $map = cf::map::find_map $path, $origin 1376 my ($map) = @_;
1209 or return; 1377
1210 $map->load; 1378 cf::sync_job { $map->load };
1211 $map
1212 }
1213} 1379}
1214 1380
1215sub save { 1381sub save {
1216 my ($self) = @_; 1382 my ($self) = @_;
1217 1383
1384 my $lock = cf::lock_acquire "map_data:" . $self->path;
1385
1386 $self->{last_save} = $cf::RUNTIME;
1387
1388 return unless $self->dirty;
1389
1218 my $save = $self->{path}->save_path; utf8::encode $save; 1390 my $save = $self->{path}->save_path; utf8::encode $save;
1219 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1391 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1220 1392
1221 $self->{last_save} = $cf::RUNTIME;
1222
1223 return unless $self->dirty;
1224
1225 $self->{load_path} = $save; 1393 $self->{load_path} = $save;
1226 1394
1227 return if $self->{deny_save}; 1395 return if $self->{deny_save};
1396
1397 local $self->{last_access} = $self->last_access;#d#
1398
1399 cf::async {
1400 $_->contr->save for $self->players;
1401 };
1228 1402
1229 if ($uniq) { 1403 if ($uniq) {
1230 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1404 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1231 $self->save_objects ($uniq, cf::IO_UNIQUES); 1405 $self->save_objects ($uniq, cf::IO_UNIQUES);
1232 } else { 1406 } else {
1235} 1409}
1236 1410
1237sub swap_out { 1411sub swap_out {
1238 my ($self) = @_; 1412 my ($self) = @_;
1239 1413
1414 # save first because save cedes
1415 $self->save;
1416
1417 my $lock = cf::lock_acquire "map_data:" . $self->path;
1418
1240 return if $self->players; 1419 return if $self->players;
1241 return if $self->in_memory != cf::MAP_IN_MEMORY; 1420 return if $self->in_memory != cf::MAP_IN_MEMORY;
1242 return if $self->{deny_save}; 1421 return if $self->{deny_save};
1243 1422
1244 $self->save;
1245 $self->clear; 1423 $self->clear;
1246 $self->in_memory (cf::MAP_SWAPPED); 1424 $self->in_memory (cf::MAP_SWAPPED);
1247} 1425}
1248 1426
1249sub reset_at { 1427sub reset_at {
1287} 1465}
1288 1466
1289sub reset { 1467sub reset {
1290 my ($self) = @_; 1468 my ($self) = @_;
1291 1469
1470 my $lock = cf::lock_acquire "map_data:" . $self->path;
1471
1292 return if $self->players; 1472 return if $self->players;
1293 return if $self->{path}{user_rel};#d# 1473 return if $self->{path}{user_rel};#d#
1294 1474
1295 warn "resetting map ", $self->path;#d# 1475 warn "resetting map ", $self->path;#d#
1296 1476
1315 1495
1316sub customise_for { 1496sub customise_for {
1317 my ($map, $ob) = @_; 1497 my ($map, $ob) = @_;
1318 1498
1319 if ($map->per_player) { 1499 if ($map->per_player) {
1320 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1500 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1321 } 1501 }
1322 1502
1323 $map 1503 $map
1324} 1504}
1325 1505
1326sub emergency_save { 1506sub emergency_save {
1327 local $cf::FREEZE = 1; 1507 my $freeze_guard = cf::freeze_mainloop;
1328 1508
1329 warn "enter emergency map save\n"; 1509 warn "enter emergency perl save\n";
1330 1510
1331 cf::sync_job { 1511 cf::sync_job {
1512 warn "begin emergency player save\n";
1513 $_->save for values %cf::PLAYER;
1514 warn "end emergency player save\n";
1515
1332 warn "begin emergency map save\n"; 1516 warn "begin emergency map save\n";
1333 $_->save for values %cf::MAP; 1517 $_->save for values %cf::MAP;
1518 warn "end emergency map save\n";
1334 }; 1519 };
1335 1520
1336 warn "end emergency map save\n"; 1521 warn "leave emergency perl save\n";
1337} 1522}
1338 1523
1339package cf; 1524package cf;
1340 1525
1341=back 1526=back
1404=cut 1589=cut
1405 1590
1406sub cf::object::player::enter_link { 1591sub cf::object::player::enter_link {
1407 my ($self) = @_; 1592 my ($self) = @_;
1408 1593
1594 $self->deactivate_recursive;
1595
1409 return if $self->map == $LINK_MAP; 1596 return if $self->map == $LINK_MAP;
1410 1597
1411 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1598 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1412 if $self->map; 1599 if $self->map;
1413 1600
1414 $self->enter_map ($LINK_MAP, 20, 20); 1601 $self->enter_map ($LINK_MAP, 20, 20);
1415 $self->deactivate_recursive;
1416} 1602}
1417 1603
1418sub cf::object::player::leave_link { 1604sub cf::object::player::leave_link {
1419 my ($self, $map, $x, $y) = @_; 1605 my ($self, $map, $x, $y) = @_;
1420 1606
1421 my $link_pos = delete $self->{_link_pos}; 1607 my $link_pos = delete $self->{_link_pos};
1422 1608
1423 unless ($map) { 1609 unless ($map) {
1424 # restore original map position 1610 # restore original map position
1425 ($map, $x, $y) = @{ $link_pos || [] }; 1611 ($map, $x, $y) = @{ $link_pos || [] };
1426 $map = cf::map::find_map $map; 1612 $map = cf::map::find $map;
1427 1613
1428 unless ($map) { 1614 unless ($map) {
1429 ($map, $x, $y) = @$EMERGENCY_POSITION; 1615 ($map, $x, $y) = @$EMERGENCY_POSITION;
1430 $map = cf::map::find_map $map 1616 $map = cf::map::find $map
1431 or die "FATAL: cannot load emergency map\n"; 1617 or die "FATAL: cannot load emergency map\n";
1432 } 1618 }
1433 } 1619 }
1434 1620
1435 ($x, $y) = (-1, -1) 1621 ($x, $y) = (-1, -1)
1439 ($x, $y) = ($map->enter_x, $map->enter_y) 1625 ($x, $y) = ($map->enter_x, $map->enter_y)
1440 if $x <=0 && $y <= 0; 1626 if $x <=0 && $y <= 0;
1441 1627
1442 $map->load; 1628 $map->load;
1443 1629
1630 return unless $self->contr->active;
1444 $self->activate_recursive; 1631 $self->activate_recursive;
1445 $self->enter_map ($map, $x, $y); 1632 $self->enter_map ($map, $x, $y);
1446} 1633}
1447 1634
1635cf::player->attach (
1636 on_logout => sub {
1637 my ($pl) = @_;
1638
1639 # abort map switching before logout
1640 if ($pl->ob->{_link_pos}) {
1641 cf::sync_job {
1642 $pl->ob->leave_link
1643 };
1644 }
1645 },
1646 on_login => sub {
1647 my ($pl) = @_;
1648
1649 # try to abort aborted map switching on player login :)
1650 # should happen only on crashes
1651 if ($pl->ob->{_link_pos}) {
1652 $pl->ob->enter_link;
1653 (async {
1654 # we need this sleep as the login has a concurrent enter_exit running
1655 # and this sleep increases chances of the player not ending up in scorn
1656 $pl->ob->reply (undef,
1657 "There was an internal problem at your last logout, "
1658 . "the server will try to bring you to your intended destination in a second.",
1659 cf::NDI_RED);
1660 Coro::Timer::sleep 1;
1661 $pl->ob->leave_link;
1662 })->prio (2);
1663 }
1664 },
1665);
1666
1448=item $player_object->goto_map ($map, $x, $y) 1667=item $player_object->goto ($path, $x, $y)
1449 1668
1450=cut 1669=cut
1451 1670
1452sub cf::object::player::goto_map { 1671sub cf::object::player::goto {
1453 my ($self, $path, $x, $y) = @_; 1672 my ($self, $path, $x, $y) = @_;
1454 1673
1455 $self->enter_link; 1674 $self->enter_link;
1456 1675
1457 (Coro::async { 1676 (async {
1458 $path = new cf::path $path; 1677 $path = new cf::path $path;
1459 1678
1460 my $map = cf::map::find_map $path->as_string; 1679 my $map = cf::map::find $path->as_string;
1461 $map = $map->customise_for ($self) if $map; 1680 $map = $map->customise_for ($self) if $map;
1462 1681
1463 warn "entering ", $map->path, " at ($x, $y)\n" 1682# warn "entering ", $map->path, " at ($x, $y)\n"
1464 if $map; 1683# if $map;
1465 1684
1685 $map or $map->cluck ("oy");#d#
1466 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1686 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1467 1687
1468 $self->leave_link ($map, $x, $y); 1688 $self->leave_link ($map, $x, $y);
1469 })->prio (1); 1689 })->prio (1);
1470} 1690}
1471 1691
1524 1744
1525 return unless $self->type == cf::PLAYER; 1745 return unless $self->type == cf::PLAYER;
1526 1746
1527 $self->enter_link; 1747 $self->enter_link;
1528 1748
1529 (Coro::async { 1749 (async {
1750 $self->deactivate_recursive; # just to be sure
1530 unless (eval { 1751 unless (eval {
1531
1532 prepare_random_map $exit 1752 prepare_random_map $exit
1533 if $exit->slaying eq "/!"; 1753 if $exit->slaying eq "/!";
1534 1754
1535 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1755 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1536 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1756 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1537 1757
1538 1; 1758 1;
1539 }) { 1759 }) {
1540 $self->message ("Something went wrong deep within the crossfire server. " 1760 $self->message ("Something went wrong deep within the crossfire server. "
1541 . "I'll try to bring you back to the map you were before. " 1761 . "I'll try to bring you back to the map you were before. "
1598 on_reply => sub { 1818 on_reply => sub {
1599 my ($ns, $msg) = @_; 1819 my ($ns, $msg) = @_;
1600 1820
1601 # this weird shuffling is so that direct followup queries 1821 # this weird shuffling is so that direct followup queries
1602 # get handled first 1822 # get handled first
1603 my $queue = delete $ns->{query_queue}; 1823 my $queue = delete $ns->{query_queue}
1824 or return; # be conservative, not sure how that can happen, but we saw a crash here
1604 1825
1605 (shift @$queue)->[1]->($msg); 1826 (shift @$queue)->[1]->($msg);
1606 1827
1607 push @{ $ns->{query_queue} }, @$queue; 1828 push @{ $ns->{query_queue} }, @$queue;
1608 1829
1614 } 1835 }
1615 } 1836 }
1616 }, 1837 },
1617); 1838);
1618 1839
1619=item $client->coro (\&cb) 1840=item $client->async (\&cb)
1620 1841
1621Create a new coroutine, running the specified callback. The coroutine will 1842Create a new coroutine, running the specified callback. The coroutine will
1622be automatically cancelled when the client gets destroyed (e.g. on logout, 1843be automatically cancelled when the client gets destroyed (e.g. on logout,
1623or loss of connection). 1844or loss of connection).
1624 1845
1625=cut 1846=cut
1626 1847
1627sub cf::client::coro { 1848sub cf::client::async {
1628 my ($self, $cb) = @_; 1849 my ($self, $cb) = @_;
1629 1850
1630 my $coro; $coro = async { 1851 my $coro = &Coro::async ($cb);
1631 eval {
1632 $cb->();
1633 };
1634 warn $@ if $@;
1635 };
1636 1852
1637 $coro->on_destroy (sub { 1853 $coro->on_destroy (sub {
1638 delete $self->{_coro}{$coro+0}; 1854 delete $self->{_coro}{$coro+0};
1639 }); 1855 });
1640 1856
1812 2028
1813{ 2029{
1814 my $path = cf::localdir . "/database.pst"; 2030 my $path = cf::localdir . "/database.pst";
1815 2031
1816 sub db_load() { 2032 sub db_load() {
1817 warn "loading database $path\n";#d# remove later
1818 $DB = stat $path ? Storable::retrieve $path : { }; 2033 $DB = stat $path ? Storable::retrieve $path : { };
1819 } 2034 }
1820 2035
1821 my $pid; 2036 my $pid;
1822 2037
1823 sub db_save() { 2038 sub db_save() {
1824 warn "saving database $path\n";#d# remove later
1825 waitpid $pid, 0 if $pid; 2039 waitpid $pid, 0 if $pid;
1826 if (0 == ($pid = fork)) { 2040 if (0 == ($pid = fork)) {
1827 $DB->{_meta}{version} = 1; 2041 $DB->{_meta}{version} = 1;
1828 Storable::nstore $DB, "$path~"; 2042 Storable::nstore $DB, "$path~";
1829 rename "$path~", $path; 2043 rename "$path~", $path;
1877 open my $fh, "<:utf8", cf::confdir . "/config" 2091 open my $fh, "<:utf8", cf::confdir . "/config"
1878 or return; 2092 or return;
1879 2093
1880 local $/; 2094 local $/;
1881 *CFG = YAML::Syck::Load <$fh>; 2095 *CFG = YAML::Syck::Load <$fh>;
2096
2097 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2098
2099 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2100 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2101
2102 if (exists $CFG{mlockall}) {
2103 eval {
2104 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2105 and die "WARNING: m(un)lockall failed: $!\n";
2106 };
2107 warn $@ if $@;
2108 }
1882} 2109}
1883 2110
1884sub main { 2111sub main {
1885 # we must not ever block the main coroutine 2112 # we must not ever block the main coroutine
1886 local $Coro::idle = sub { 2113 local $Coro::idle = sub {
1887 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2114 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1888 (Coro::unblock_sub {
1889 Event::one_event; 2115 async { Event::one_event };
1890 })->();
1891 }; 2116 };
1892 2117
1893 cfg_load; 2118 cfg_load;
1894 db_load; 2119 db_load;
1895 load_extensions; 2120 load_extensions;
1906 return; 2131 return;
1907 } 2132 }
1908 2133
1909 warn "reloading..."; 2134 warn "reloading...";
1910 2135
1911 local $FREEZE = 1; 2136 my $guard = freeze_mainloop;
1912 cf::emergency_save; 2137 cf::emergency_save;
1913 2138
1914 eval { 2139 eval {
1915 # if anything goes wrong in here, we should simply crash as we already saved 2140 # if anything goes wrong in here, we should simply crash as we already saved
1916 2141
1978 cf::load_extensions; 2203 cf::load_extensions;
1979 2204
1980 # reattach attachments to objects 2205 # reattach attachments to objects
1981 warn "reattach"; 2206 warn "reattach";
1982 _global_reattach; 2207 _global_reattach;
2208 reattach $_ for values %MAP;
1983 }; 2209 };
1984 2210
1985 if ($@) { 2211 if ($@) {
1986 warn $@; 2212 warn $@;
1987 warn "error while reloading, exiting."; 2213 warn "error while reloading, exiting.";
2003 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2229 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2004 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2230 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2005 2231
2006 # dirty hack because... archetypes are not yet loaded 2232 # dirty hack because... archetypes are not yet loaded
2007 Event->timer ( 2233 Event->timer (
2008 after => 2, 2234 after => 10,
2009 cb => sub { 2235 cb => sub {
2010 $_[0]->w->cancel; 2236 $_[0]->w->cancel;
2011 2237
2012 # provide some exits "home" 2238 # provide some exits "home"
2013 my $exit = cf::object::new "exit"; 2239 my $exit = cf::object::new "exit";
2052 reentrant => 0, 2278 reentrant => 0,
2053 prio => 0, 2279 prio => 0,
2054 at => $NEXT_TICK || $TICK, 2280 at => $NEXT_TICK || $TICK,
2055 data => WF_AUTOCANCEL, 2281 data => WF_AUTOCANCEL,
2056 cb => sub { 2282 cb => sub {
2057 unless ($FREEZE) {
2058 cf::server_tick; # one server iteration 2283 cf::server_tick; # one server iteration
2059 $RUNTIME += $TICK; 2284 $RUNTIME += $TICK;
2060 }
2061
2062 $NEXT_TICK += $TICK; 2285 $NEXT_TICK += $TICK;
2063 2286
2064 # if we are delayed by four ticks or more, skip them all 2287 # if we are delayed by four ticks or more, skip them all
2065 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2288 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2066 2289
2089 or warn "ERROR: unable to write runtime file: $!"; 2312 or warn "ERROR: unable to write runtime file: $!";
2090 })->(); 2313 })->();
2091 }, 2314 },
2092); 2315);
2093 2316
2317END { cf::emergency_save }
2318
20941 23191
2095 2320

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines